diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandleBean; + +public interface ICaseListHandleView { + void obtainCaseHandleList(CaseHandleBean resultBean); +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e7ddeba..320d7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; @@ -59,7 +59,7 @@ import cn.jzvd.JzvdStd; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, - IUploadFileView, ICaseNextNodeView, ICaseHandleView { + IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e7ddeba..320d7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; @@ -59,7 +59,7 @@ import cn.jzvd.JzvdStd; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, - IUploadFileView, ICaseNextNodeView, ICaseHandleView { + IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) 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 22b83e8..84e1c73 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -27,7 +27,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -63,7 +63,7 @@ import cn.jzvd.JzvdStd; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e7ddeba..320d7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; @@ -59,7 +59,7 @@ import cn.jzvd.JzvdStd; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, - IUploadFileView, ICaseNextNodeView, ICaseHandleView { + IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) 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 22b83e8..84e1c73 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -27,7 +27,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -63,7 +63,7 @@ import cn.jzvd.JzvdStd; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) 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 d88d6f3..ca2ff5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; import com.casic.dcms.mvp.presenter.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; +import com.casic.dcms.mvp.presenter.CaseListHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseCheckView; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -59,7 +59,7 @@ import butterknife.BindView; public class CaseOnMapActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseHandleListView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; @BindView(R.id.topLayout) @@ -75,7 +75,7 @@ @BindView(R.id.checkRadioButton) RadioButton checkRadioButton; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -123,7 +123,7 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e7ddeba..320d7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; @@ -59,7 +59,7 @@ import cn.jzvd.JzvdStd; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, - IUploadFileView, ICaseNextNodeView, ICaseHandleView { + IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) 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 22b83e8..84e1c73 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -27,7 +27,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -63,7 +63,7 @@ import cn.jzvd.JzvdStd; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) 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 d88d6f3..ca2ff5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; import com.casic.dcms.mvp.presenter.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; +import com.casic.dcms.mvp.presenter.CaseListHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseCheckView; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -59,7 +59,7 @@ import butterknife.BindView; public class CaseOnMapActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseHandleListView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; @BindView(R.id.topLayout) @@ -75,7 +75,7 @@ @BindView(R.id.checkRadioButton) RadioButton checkRadioButton; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -123,7 +123,7 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 2ab7451..d55539b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -31,7 +31,7 @@ import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -67,7 +67,7 @@ import cn.jzvd.JzvdStd; public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = this; @BindView(R.id.caseNumberView) diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e7ddeba..320d7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; @@ -59,7 +59,7 @@ import cn.jzvd.JzvdStd; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, - IUploadFileView, ICaseNextNodeView, ICaseHandleView { + IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) 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 22b83e8..84e1c73 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -27,7 +27,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -63,7 +63,7 @@ import cn.jzvd.JzvdStd; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) 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 d88d6f3..ca2ff5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; import com.casic.dcms.mvp.presenter.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; +import com.casic.dcms.mvp.presenter.CaseListHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseCheckView; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -59,7 +59,7 @@ import butterknife.BindView; public class CaseOnMapActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseHandleListView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; @BindView(R.id.topLayout) @@ -75,7 +75,7 @@ @BindView(R.id.checkRadioButton) RadioButton checkRadioButton; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -123,7 +123,7 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 2ab7451..d55539b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -31,7 +31,7 @@ import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -67,7 +67,7 @@ import cn.jzvd.JzvdStd; public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 3b57d7b..e3c6a54 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -145,6 +145,34 @@ }); imageAdapter.setDeleteView(false); } + + //处罚记录 + punishTypeView.setText(StringHelper.TypeToString(data.getPunishType())); + punishOpinionView.setText(StringHelper.filterString(data.getPunishRemarks())); + String punishImages = data.getPunishImage(); + if (!TextUtils.isEmpty(punishImages)) { + ArrayList urls = new ArrayList<>(); + String[] split = punishImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); + punishRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + punishDateView.setText(data.getPunishTime()); } } diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e7ddeba..320d7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; @@ -59,7 +59,7 @@ import cn.jzvd.JzvdStd; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, - IUploadFileView, ICaseNextNodeView, ICaseHandleView { + IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) 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 22b83e8..84e1c73 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -27,7 +27,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -63,7 +63,7 @@ import cn.jzvd.JzvdStd; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) 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 d88d6f3..ca2ff5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; import com.casic.dcms.mvp.presenter.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; +import com.casic.dcms.mvp.presenter.CaseListHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseCheckView; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -59,7 +59,7 @@ import butterknife.BindView; public class CaseOnMapActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseHandleListView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; @BindView(R.id.topLayout) @@ -75,7 +75,7 @@ @BindView(R.id.checkRadioButton) RadioButton checkRadioButton; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -123,7 +123,7 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 2ab7451..d55539b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -31,7 +31,7 @@ import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -67,7 +67,7 @@ import cn.jzvd.JzvdStd; public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 3b57d7b..e3c6a54 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -145,6 +145,34 @@ }); imageAdapter.setDeleteView(false); } + + //处罚记录 + punishTypeView.setText(StringHelper.TypeToString(data.getPunishType())); + punishOpinionView.setText(StringHelper.filterString(data.getPunishRemarks())); + String punishImages = data.getPunishImage(); + if (!TextUtils.isEmpty(punishImages)) { + ArrayList urls = new ArrayList<>(); + String[] split = punishImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); + punishRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + punishDateView.setText(data.getPunishTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index f971c57..c77c3cf 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -25,10 +25,12 @@ import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; +import com.casic.dcms.mvp.presenter.PackageHandlePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; @@ -60,7 +62,7 @@ import butterknife.OnClick; public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; @@ -129,6 +131,10 @@ private String id;//案卷id private CaseHandlePresenterImpl caseHandlePresenter; private String handleResult; + private PackageHandlePresenterImpl packageHandlePresenter; + private String punishOpinion; + private String punishType;//处罚类型文字 + private String punishTime; @Override public int initLayoutView() { @@ -164,6 +170,7 @@ caseHandleRecyclerView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); + packageHandlePresenter = new PackageHandlePresenterImpl(this); } @Override @@ -245,7 +252,7 @@ @Override public void obtainDataFail() { - ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + ToastHelper.showToast("操作失败", ToastHelper.ERROR); } @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addHandleImageView, R.id.punishHandleLayout, @@ -548,13 +555,13 @@ return; } //只有选择处理完成才需要判断处罚条件 - String punishType = punishTypeView.getText().toString().trim().replace(" ", ""); + punishType = punishTypeView.getText().toString(); if (TextUtils.isEmpty(punishType)) { ToastHelper.showToast("处罚类型还未选择", ToastHelper.WARING); return; } - String punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(punishType)) { + punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(punishOpinion)) { ToastHelper.showToast("处罚意见还未填写", ToastHelper.WARING); return; } @@ -568,6 +575,9 @@ } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); + + //处理之后才能处罚，所以在处理之后才获取处罚时间 + punishTime = punishDateView.getText().toString(); } @Override @@ -575,8 +585,8 @@ if (resultBean.isSuccess()) { if (handleResult.equals("处理完成")) { //只有选择处理完成才需要操作处罚流程 -// casePunishPresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(punishImageList), approvalResult); + packageHandlePresenter.onReadyRetrofitRequest(id, StringHelper.StringToType(punishType), + punishOpinion, punishTime, StringHelper.reformatURL(punishImageList)); } else { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); @@ -586,6 +596,15 @@ } } + @Override + public void obtainPackageHandleResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); + PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + PackageHandledFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + finish(); + } + } @Override protected void onDestroy() { @@ -602,5 +621,8 @@ if (caseHandlePresenter != null) { caseHandlePresenter.disposeRetrofitRequest(); } + if (packageHandlePresenter != null) { + packageHandlePresenter.disposeRetrofitRequest(); + } } } diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e7ddeba..320d7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; @@ -59,7 +59,7 @@ import cn.jzvd.JzvdStd; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, - IUploadFileView, ICaseNextNodeView, ICaseHandleView { + IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) 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 22b83e8..84e1c73 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -27,7 +27,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -63,7 +63,7 @@ import cn.jzvd.JzvdStd; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) 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 d88d6f3..ca2ff5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; import com.casic.dcms.mvp.presenter.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; +import com.casic.dcms.mvp.presenter.CaseListHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseCheckView; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -59,7 +59,7 @@ import butterknife.BindView; public class CaseOnMapActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseHandleListView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; @BindView(R.id.topLayout) @@ -75,7 +75,7 @@ @BindView(R.id.checkRadioButton) RadioButton checkRadioButton; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -123,7 +123,7 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 2ab7451..d55539b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -31,7 +31,7 @@ import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -67,7 +67,7 @@ import cn.jzvd.JzvdStd; public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 3b57d7b..e3c6a54 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -145,6 +145,34 @@ }); imageAdapter.setDeleteView(false); } + + //处罚记录 + punishTypeView.setText(StringHelper.TypeToString(data.getPunishType())); + punishOpinionView.setText(StringHelper.filterString(data.getPunishRemarks())); + String punishImages = data.getPunishImage(); + if (!TextUtils.isEmpty(punishImages)) { + ArrayList urls = new ArrayList<>(); + String[] split = punishImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); + punishRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + punishDateView.setText(data.getPunishTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index f971c57..c77c3cf 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -25,10 +25,12 @@ import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; +import com.casic.dcms.mvp.presenter.PackageHandlePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; @@ -60,7 +62,7 @@ import butterknife.OnClick; public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; @@ -129,6 +131,10 @@ private String id;//案卷id private CaseHandlePresenterImpl caseHandlePresenter; private String handleResult; + private PackageHandlePresenterImpl packageHandlePresenter; + private String punishOpinion; + private String punishType;//处罚类型文字 + private String punishTime; @Override public int initLayoutView() { @@ -164,6 +170,7 @@ caseHandleRecyclerView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); + packageHandlePresenter = new PackageHandlePresenterImpl(this); } @Override @@ -245,7 +252,7 @@ @Override public void obtainDataFail() { - ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + ToastHelper.showToast("操作失败", ToastHelper.ERROR); } @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addHandleImageView, R.id.punishHandleLayout, @@ -548,13 +555,13 @@ return; } //只有选择处理完成才需要判断处罚条件 - String punishType = punishTypeView.getText().toString().trim().replace(" ", ""); + punishType = punishTypeView.getText().toString(); if (TextUtils.isEmpty(punishType)) { ToastHelper.showToast("处罚类型还未选择", ToastHelper.WARING); return; } - String punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(punishType)) { + punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(punishOpinion)) { ToastHelper.showToast("处罚意见还未填写", ToastHelper.WARING); return; } @@ -568,6 +575,9 @@ } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); + + //处理之后才能处罚，所以在处理之后才获取处罚时间 + punishTime = punishDateView.getText().toString(); } @Override @@ -575,8 +585,8 @@ if (resultBean.isSuccess()) { if (handleResult.equals("处理完成")) { //只有选择处理完成才需要操作处罚流程 -// casePunishPresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(punishImageList), approvalResult); + packageHandlePresenter.onReadyRetrofitRequest(id, StringHelper.StringToType(punishType), + punishOpinion, punishTime, StringHelper.reformatURL(punishImageList)); } else { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); @@ -586,6 +596,15 @@ } } + @Override + public void obtainPackageHandleResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); + PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + PackageHandledFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + finish(); + } + } @Override protected void onDestroy() { @@ -602,5 +621,8 @@ if (caseHandlePresenter != null) { caseHandlePresenter.disposeRetrofitRequest(); } + if (packageHandlePresenter != null) { + packageHandlePresenter.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 916ad06..d84b4ca 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.presenter.CaseHandledListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; +import com.casic.dcms.mvp.presenter.CaseListHandledPresenterImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseHandledFragment extends BaseFragment implements ICaseHandledListView { +public class CaseHandledFragment extends BaseFragment implements ICaseListHandledView { private static final String TAG = "CaseHandledFragment"; private Context context; @@ -45,7 +45,7 @@ RecyclerView caseRecyclerView; private int pageIndex = 1; - private CaseHandledListPresenterImpl caseHandledListPresenter; + private CaseListHandledPresenterImpl caseHandledListPresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseHandledListPresenterImpl(this); + caseHandledListPresenter = new CaseListHandledPresenterImpl(this); caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e7ddeba..320d7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; @@ -59,7 +59,7 @@ import cn.jzvd.JzvdStd; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, - IUploadFileView, ICaseNextNodeView, ICaseHandleView { + IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) 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 22b83e8..84e1c73 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -27,7 +27,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -63,7 +63,7 @@ import cn.jzvd.JzvdStd; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) 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 d88d6f3..ca2ff5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; import com.casic.dcms.mvp.presenter.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; +import com.casic.dcms.mvp.presenter.CaseListHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseCheckView; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -59,7 +59,7 @@ import butterknife.BindView; public class CaseOnMapActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseHandleListView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; @BindView(R.id.topLayout) @@ -75,7 +75,7 @@ @BindView(R.id.checkRadioButton) RadioButton checkRadioButton; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -123,7 +123,7 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 2ab7451..d55539b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -31,7 +31,7 @@ import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -67,7 +67,7 @@ import cn.jzvd.JzvdStd; public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 3b57d7b..e3c6a54 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -145,6 +145,34 @@ }); imageAdapter.setDeleteView(false); } + + //处罚记录 + punishTypeView.setText(StringHelper.TypeToString(data.getPunishType())); + punishOpinionView.setText(StringHelper.filterString(data.getPunishRemarks())); + String punishImages = data.getPunishImage(); + if (!TextUtils.isEmpty(punishImages)) { + ArrayList urls = new ArrayList<>(); + String[] split = punishImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); + punishRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + punishDateView.setText(data.getPunishTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index f971c57..c77c3cf 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -25,10 +25,12 @@ import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; +import com.casic.dcms.mvp.presenter.PackageHandlePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; @@ -60,7 +62,7 @@ import butterknife.OnClick; public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; @@ -129,6 +131,10 @@ private String id;//案卷id private CaseHandlePresenterImpl caseHandlePresenter; private String handleResult; + private PackageHandlePresenterImpl packageHandlePresenter; + private String punishOpinion; + private String punishType;//处罚类型文字 + private String punishTime; @Override public int initLayoutView() { @@ -164,6 +170,7 @@ caseHandleRecyclerView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); + packageHandlePresenter = new PackageHandlePresenterImpl(this); } @Override @@ -245,7 +252,7 @@ @Override public void obtainDataFail() { - ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + ToastHelper.showToast("操作失败", ToastHelper.ERROR); } @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addHandleImageView, R.id.punishHandleLayout, @@ -548,13 +555,13 @@ return; } //只有选择处理完成才需要判断处罚条件 - String punishType = punishTypeView.getText().toString().trim().replace(" ", ""); + punishType = punishTypeView.getText().toString(); if (TextUtils.isEmpty(punishType)) { ToastHelper.showToast("处罚类型还未选择", ToastHelper.WARING); return; } - String punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(punishType)) { + punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(punishOpinion)) { ToastHelper.showToast("处罚意见还未填写", ToastHelper.WARING); return; } @@ -568,6 +575,9 @@ } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); + + //处理之后才能处罚，所以在处理之后才获取处罚时间 + punishTime = punishDateView.getText().toString(); } @Override @@ -575,8 +585,8 @@ if (resultBean.isSuccess()) { if (handleResult.equals("处理完成")) { //只有选择处理完成才需要操作处罚流程 -// casePunishPresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(punishImageList), approvalResult); + packageHandlePresenter.onReadyRetrofitRequest(id, StringHelper.StringToType(punishType), + punishOpinion, punishTime, StringHelper.reformatURL(punishImageList)); } else { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); @@ -586,6 +596,15 @@ } } + @Override + public void obtainPackageHandleResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); + PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + PackageHandledFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + finish(); + } + } @Override protected void onDestroy() { @@ -602,5 +621,8 @@ if (caseHandlePresenter != null) { caseHandlePresenter.disposeRetrofitRequest(); } + if (packageHandlePresenter != null) { + packageHandlePresenter.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 916ad06..d84b4ca 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.presenter.CaseHandledListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; +import com.casic.dcms.mvp.presenter.CaseListHandledPresenterImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseHandledFragment extends BaseFragment implements ICaseHandledListView { +public class CaseHandledFragment extends BaseFragment implements ICaseListHandledView { private static final String TAG = "CaseHandledFragment"; private Context context; @@ -45,7 +45,7 @@ RecyclerView caseRecyclerView; private int pageIndex = 1; - private CaseHandledListPresenterImpl caseHandledListPresenter; + private CaseListHandledPresenterImpl caseHandledListPresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseHandledListPresenterImpl(this); + caseHandledListPresenter = new CaseListHandledPresenterImpl(this); caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); 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 a8e7cc6..4bf5491 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseTodoFragment extends BaseFragment implements ICaseHandleListView { +public class CaseTodoFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "CaseTodoFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e7ddeba..320d7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; @@ -59,7 +59,7 @@ import cn.jzvd.JzvdStd; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, - IUploadFileView, ICaseNextNodeView, ICaseHandleView { + IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) 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 22b83e8..84e1c73 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -27,7 +27,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -63,7 +63,7 @@ import cn.jzvd.JzvdStd; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) 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 d88d6f3..ca2ff5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; import com.casic.dcms.mvp.presenter.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; +import com.casic.dcms.mvp.presenter.CaseListHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseCheckView; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -59,7 +59,7 @@ import butterknife.BindView; public class CaseOnMapActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseHandleListView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; @BindView(R.id.topLayout) @@ -75,7 +75,7 @@ @BindView(R.id.checkRadioButton) RadioButton checkRadioButton; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -123,7 +123,7 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 2ab7451..d55539b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -31,7 +31,7 @@ import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -67,7 +67,7 @@ import cn.jzvd.JzvdStd; public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 3b57d7b..e3c6a54 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -145,6 +145,34 @@ }); imageAdapter.setDeleteView(false); } + + //处罚记录 + punishTypeView.setText(StringHelper.TypeToString(data.getPunishType())); + punishOpinionView.setText(StringHelper.filterString(data.getPunishRemarks())); + String punishImages = data.getPunishImage(); + if (!TextUtils.isEmpty(punishImages)) { + ArrayList urls = new ArrayList<>(); + String[] split = punishImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); + punishRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + punishDateView.setText(data.getPunishTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index f971c57..c77c3cf 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -25,10 +25,12 @@ import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; +import com.casic.dcms.mvp.presenter.PackageHandlePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; @@ -60,7 +62,7 @@ import butterknife.OnClick; public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; @@ -129,6 +131,10 @@ private String id;//案卷id private CaseHandlePresenterImpl caseHandlePresenter; private String handleResult; + private PackageHandlePresenterImpl packageHandlePresenter; + private String punishOpinion; + private String punishType;//处罚类型文字 + private String punishTime; @Override public int initLayoutView() { @@ -164,6 +170,7 @@ caseHandleRecyclerView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); + packageHandlePresenter = new PackageHandlePresenterImpl(this); } @Override @@ -245,7 +252,7 @@ @Override public void obtainDataFail() { - ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + ToastHelper.showToast("操作失败", ToastHelper.ERROR); } @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addHandleImageView, R.id.punishHandleLayout, @@ -548,13 +555,13 @@ return; } //只有选择处理完成才需要判断处罚条件 - String punishType = punishTypeView.getText().toString().trim().replace(" ", ""); + punishType = punishTypeView.getText().toString(); if (TextUtils.isEmpty(punishType)) { ToastHelper.showToast("处罚类型还未选择", ToastHelper.WARING); return; } - String punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(punishType)) { + punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(punishOpinion)) { ToastHelper.showToast("处罚意见还未填写", ToastHelper.WARING); return; } @@ -568,6 +575,9 @@ } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); + + //处理之后才能处罚，所以在处理之后才获取处罚时间 + punishTime = punishDateView.getText().toString(); } @Override @@ -575,8 +585,8 @@ if (resultBean.isSuccess()) { if (handleResult.equals("处理完成")) { //只有选择处理完成才需要操作处罚流程 -// casePunishPresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(punishImageList), approvalResult); + packageHandlePresenter.onReadyRetrofitRequest(id, StringHelper.StringToType(punishType), + punishOpinion, punishTime, StringHelper.reformatURL(punishImageList)); } else { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); @@ -586,6 +596,15 @@ } } + @Override + public void obtainPackageHandleResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); + PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + PackageHandledFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + finish(); + } + } @Override protected void onDestroy() { @@ -602,5 +621,8 @@ if (caseHandlePresenter != null) { caseHandlePresenter.disposeRetrofitRequest(); } + if (packageHandlePresenter != null) { + packageHandlePresenter.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 916ad06..d84b4ca 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.presenter.CaseHandledListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; +import com.casic.dcms.mvp.presenter.CaseListHandledPresenterImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseHandledFragment extends BaseFragment implements ICaseHandledListView { +public class CaseHandledFragment extends BaseFragment implements ICaseListHandledView { private static final String TAG = "CaseHandledFragment"; private Context context; @@ -45,7 +45,7 @@ RecyclerView caseRecyclerView; private int pageIndex = 1; - private CaseHandledListPresenterImpl caseHandledListPresenter; + private CaseListHandledPresenterImpl caseHandledListPresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseHandledListPresenterImpl(this); + caseHandledListPresenter = new CaseListHandledPresenterImpl(this); caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); 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 a8e7cc6..4bf5491 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseTodoFragment extends BaseFragment implements ICaseHandleListView { +public class CaseTodoFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "CaseTodoFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 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 index 8a14832..8e81bee 100644 --- 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class OvertimeCaseFragment extends BaseFragment implements ICaseHandleListView { +public class OvertimeCaseFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "OvertimeCaseFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e7ddeba..320d7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; @@ -59,7 +59,7 @@ import cn.jzvd.JzvdStd; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, - IUploadFileView, ICaseNextNodeView, ICaseHandleView { + IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) 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 22b83e8..84e1c73 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -27,7 +27,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -63,7 +63,7 @@ import cn.jzvd.JzvdStd; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) 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 d88d6f3..ca2ff5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; import com.casic.dcms.mvp.presenter.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; +import com.casic.dcms.mvp.presenter.CaseListHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseCheckView; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -59,7 +59,7 @@ import butterknife.BindView; public class CaseOnMapActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseHandleListView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; @BindView(R.id.topLayout) @@ -75,7 +75,7 @@ @BindView(R.id.checkRadioButton) RadioButton checkRadioButton; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -123,7 +123,7 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 2ab7451..d55539b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -31,7 +31,7 @@ import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -67,7 +67,7 @@ import cn.jzvd.JzvdStd; public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 3b57d7b..e3c6a54 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -145,6 +145,34 @@ }); imageAdapter.setDeleteView(false); } + + //处罚记录 + punishTypeView.setText(StringHelper.TypeToString(data.getPunishType())); + punishOpinionView.setText(StringHelper.filterString(data.getPunishRemarks())); + String punishImages = data.getPunishImage(); + if (!TextUtils.isEmpty(punishImages)) { + ArrayList urls = new ArrayList<>(); + String[] split = punishImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); + punishRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + punishDateView.setText(data.getPunishTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index f971c57..c77c3cf 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -25,10 +25,12 @@ import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; +import com.casic.dcms.mvp.presenter.PackageHandlePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; @@ -60,7 +62,7 @@ import butterknife.OnClick; public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; @@ -129,6 +131,10 @@ private String id;//案卷id private CaseHandlePresenterImpl caseHandlePresenter; private String handleResult; + private PackageHandlePresenterImpl packageHandlePresenter; + private String punishOpinion; + private String punishType;//处罚类型文字 + private String punishTime; @Override public int initLayoutView() { @@ -164,6 +170,7 @@ caseHandleRecyclerView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); + packageHandlePresenter = new PackageHandlePresenterImpl(this); } @Override @@ -245,7 +252,7 @@ @Override public void obtainDataFail() { - ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + ToastHelper.showToast("操作失败", ToastHelper.ERROR); } @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addHandleImageView, R.id.punishHandleLayout, @@ -548,13 +555,13 @@ return; } //只有选择处理完成才需要判断处罚条件 - String punishType = punishTypeView.getText().toString().trim().replace(" ", ""); + punishType = punishTypeView.getText().toString(); if (TextUtils.isEmpty(punishType)) { ToastHelper.showToast("处罚类型还未选择", ToastHelper.WARING); return; } - String punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(punishType)) { + punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(punishOpinion)) { ToastHelper.showToast("处罚意见还未填写", ToastHelper.WARING); return; } @@ -568,6 +575,9 @@ } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); + + //处理之后才能处罚，所以在处理之后才获取处罚时间 + punishTime = punishDateView.getText().toString(); } @Override @@ -575,8 +585,8 @@ if (resultBean.isSuccess()) { if (handleResult.equals("处理完成")) { //只有选择处理完成才需要操作处罚流程 -// casePunishPresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(punishImageList), approvalResult); + packageHandlePresenter.onReadyRetrofitRequest(id, StringHelper.StringToType(punishType), + punishOpinion, punishTime, StringHelper.reformatURL(punishImageList)); } else { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); @@ -586,6 +596,15 @@ } } + @Override + public void obtainPackageHandleResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); + PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + PackageHandledFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + finish(); + } + } @Override protected void onDestroy() { @@ -602,5 +621,8 @@ if (caseHandlePresenter != null) { caseHandlePresenter.disposeRetrofitRequest(); } + if (packageHandlePresenter != null) { + packageHandlePresenter.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 916ad06..d84b4ca 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.presenter.CaseHandledListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; +import com.casic.dcms.mvp.presenter.CaseListHandledPresenterImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseHandledFragment extends BaseFragment implements ICaseHandledListView { +public class CaseHandledFragment extends BaseFragment implements ICaseListHandledView { private static final String TAG = "CaseHandledFragment"; private Context context; @@ -45,7 +45,7 @@ RecyclerView caseRecyclerView; private int pageIndex = 1; - private CaseHandledListPresenterImpl caseHandledListPresenter; + private CaseListHandledPresenterImpl caseHandledListPresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseHandledListPresenterImpl(this); + caseHandledListPresenter = new CaseListHandledPresenterImpl(this); caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); 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 a8e7cc6..4bf5491 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseTodoFragment extends BaseFragment implements ICaseHandleListView { +public class CaseTodoFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "CaseTodoFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 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 index 8a14832..8e81bee 100644 --- 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class OvertimeCaseFragment extends BaseFragment implements ICaseHandleListView { +public class OvertimeCaseFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "OvertimeCaseFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 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 index edbad6e..24cc15a 100644 --- 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class UrgentCaseFragment extends BaseFragment implements ICaseHandleListView { +public class UrgentCaseFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "UrgentCaseFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e7ddeba..320d7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; @@ -59,7 +59,7 @@ import cn.jzvd.JzvdStd; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, - IUploadFileView, ICaseNextNodeView, ICaseHandleView { + IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) 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 22b83e8..84e1c73 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -27,7 +27,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -63,7 +63,7 @@ import cn.jzvd.JzvdStd; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) 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 d88d6f3..ca2ff5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; import com.casic.dcms.mvp.presenter.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; +import com.casic.dcms.mvp.presenter.CaseListHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseCheckView; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -59,7 +59,7 @@ import butterknife.BindView; public class CaseOnMapActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseHandleListView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; @BindView(R.id.topLayout) @@ -75,7 +75,7 @@ @BindView(R.id.checkRadioButton) RadioButton checkRadioButton; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -123,7 +123,7 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 2ab7451..d55539b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -31,7 +31,7 @@ import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -67,7 +67,7 @@ import cn.jzvd.JzvdStd; public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 3b57d7b..e3c6a54 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -145,6 +145,34 @@ }); imageAdapter.setDeleteView(false); } + + //处罚记录 + punishTypeView.setText(StringHelper.TypeToString(data.getPunishType())); + punishOpinionView.setText(StringHelper.filterString(data.getPunishRemarks())); + String punishImages = data.getPunishImage(); + if (!TextUtils.isEmpty(punishImages)) { + ArrayList urls = new ArrayList<>(); + String[] split = punishImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); + punishRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + punishDateView.setText(data.getPunishTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index f971c57..c77c3cf 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -25,10 +25,12 @@ import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; +import com.casic.dcms.mvp.presenter.PackageHandlePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; @@ -60,7 +62,7 @@ import butterknife.OnClick; public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; @@ -129,6 +131,10 @@ private String id;//案卷id private CaseHandlePresenterImpl caseHandlePresenter; private String handleResult; + private PackageHandlePresenterImpl packageHandlePresenter; + private String punishOpinion; + private String punishType;//处罚类型文字 + private String punishTime; @Override public int initLayoutView() { @@ -164,6 +170,7 @@ caseHandleRecyclerView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); + packageHandlePresenter = new PackageHandlePresenterImpl(this); } @Override @@ -245,7 +252,7 @@ @Override public void obtainDataFail() { - ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + ToastHelper.showToast("操作失败", ToastHelper.ERROR); } @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addHandleImageView, R.id.punishHandleLayout, @@ -548,13 +555,13 @@ return; } //只有选择处理完成才需要判断处罚条件 - String punishType = punishTypeView.getText().toString().trim().replace(" ", ""); + punishType = punishTypeView.getText().toString(); if (TextUtils.isEmpty(punishType)) { ToastHelper.showToast("处罚类型还未选择", ToastHelper.WARING); return; } - String punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(punishType)) { + punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(punishOpinion)) { ToastHelper.showToast("处罚意见还未填写", ToastHelper.WARING); return; } @@ -568,6 +575,9 @@ } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); + + //处理之后才能处罚，所以在处理之后才获取处罚时间 + punishTime = punishDateView.getText().toString(); } @Override @@ -575,8 +585,8 @@ if (resultBean.isSuccess()) { if (handleResult.equals("处理完成")) { //只有选择处理完成才需要操作处罚流程 -// casePunishPresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(punishImageList), approvalResult); + packageHandlePresenter.onReadyRetrofitRequest(id, StringHelper.StringToType(punishType), + punishOpinion, punishTime, StringHelper.reformatURL(punishImageList)); } else { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); @@ -586,6 +596,15 @@ } } + @Override + public void obtainPackageHandleResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); + PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + PackageHandledFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + finish(); + } + } @Override protected void onDestroy() { @@ -602,5 +621,8 @@ if (caseHandlePresenter != null) { caseHandlePresenter.disposeRetrofitRequest(); } + if (packageHandlePresenter != null) { + packageHandlePresenter.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 916ad06..d84b4ca 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.presenter.CaseHandledListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; +import com.casic.dcms.mvp.presenter.CaseListHandledPresenterImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseHandledFragment extends BaseFragment implements ICaseHandledListView { +public class CaseHandledFragment extends BaseFragment implements ICaseListHandledView { private static final String TAG = "CaseHandledFragment"; private Context context; @@ -45,7 +45,7 @@ RecyclerView caseRecyclerView; private int pageIndex = 1; - private CaseHandledListPresenterImpl caseHandledListPresenter; + private CaseListHandledPresenterImpl caseHandledListPresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseHandledListPresenterImpl(this); + caseHandledListPresenter = new CaseListHandledPresenterImpl(this); caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); 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 a8e7cc6..4bf5491 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseTodoFragment extends BaseFragment implements ICaseHandleListView { +public class CaseTodoFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "CaseTodoFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 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 index 8a14832..8e81bee 100644 --- 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class OvertimeCaseFragment extends BaseFragment implements ICaseHandleListView { +public class OvertimeCaseFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "OvertimeCaseFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 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 index edbad6e..24cc15a 100644 --- 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class UrgentCaseFragment extends BaseFragment implements ICaseHandleListView { +public class UrgentCaseFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "UrgentCaseFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index a16229b..f9244ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -14,8 +14,8 @@ import com.casic.dcms.adapter.PackageHandledAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.presenter.PackageHandledPresenterImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; +import com.casic.dcms.mvp.presenter.PackageListHandledPresenterImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; import com.casic.dcms.ui.PackageHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -34,7 +34,7 @@ /** * TODO 仅搭建界面，数据还未完全绑定 */ -public class PackageHandledFragment extends BaseFragment implements IPackageHandledView { +public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @BindView(R.id.emptyView) @@ -44,7 +44,7 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageHandledPresenterImpl handledPresenter; + private PackageListHandledPresenterImpl handledPresenter; private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; @@ -63,7 +63,7 @@ @Override protected void initData() { - handledPresenter = new PackageHandledPresenterImpl(this); + handledPresenter = new PackageListHandledPresenterImpl(this); handledPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e7ddeba..320d7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; @@ -59,7 +59,7 @@ import cn.jzvd.JzvdStd; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, - IUploadFileView, ICaseNextNodeView, ICaseHandleView { + IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) 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 22b83e8..84e1c73 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -27,7 +27,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -63,7 +63,7 @@ import cn.jzvd.JzvdStd; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) 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 d88d6f3..ca2ff5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; import com.casic.dcms.mvp.presenter.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; +import com.casic.dcms.mvp.presenter.CaseListHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseCheckView; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -59,7 +59,7 @@ import butterknife.BindView; public class CaseOnMapActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseHandleListView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; @BindView(R.id.topLayout) @@ -75,7 +75,7 @@ @BindView(R.id.checkRadioButton) RadioButton checkRadioButton; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -123,7 +123,7 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 2ab7451..d55539b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -31,7 +31,7 @@ import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -67,7 +67,7 @@ import cn.jzvd.JzvdStd; public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 3b57d7b..e3c6a54 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -145,6 +145,34 @@ }); imageAdapter.setDeleteView(false); } + + //处罚记录 + punishTypeView.setText(StringHelper.TypeToString(data.getPunishType())); + punishOpinionView.setText(StringHelper.filterString(data.getPunishRemarks())); + String punishImages = data.getPunishImage(); + if (!TextUtils.isEmpty(punishImages)) { + ArrayList urls = new ArrayList<>(); + String[] split = punishImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); + punishRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + punishDateView.setText(data.getPunishTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index f971c57..c77c3cf 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -25,10 +25,12 @@ import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; +import com.casic.dcms.mvp.presenter.PackageHandlePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; @@ -60,7 +62,7 @@ import butterknife.OnClick; public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; @@ -129,6 +131,10 @@ private String id;//案卷id private CaseHandlePresenterImpl caseHandlePresenter; private String handleResult; + private PackageHandlePresenterImpl packageHandlePresenter; + private String punishOpinion; + private String punishType;//处罚类型文字 + private String punishTime; @Override public int initLayoutView() { @@ -164,6 +170,7 @@ caseHandleRecyclerView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); + packageHandlePresenter = new PackageHandlePresenterImpl(this); } @Override @@ -245,7 +252,7 @@ @Override public void obtainDataFail() { - ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + ToastHelper.showToast("操作失败", ToastHelper.ERROR); } @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addHandleImageView, R.id.punishHandleLayout, @@ -548,13 +555,13 @@ return; } //只有选择处理完成才需要判断处罚条件 - String punishType = punishTypeView.getText().toString().trim().replace(" ", ""); + punishType = punishTypeView.getText().toString(); if (TextUtils.isEmpty(punishType)) { ToastHelper.showToast("处罚类型还未选择", ToastHelper.WARING); return; } - String punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(punishType)) { + punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(punishOpinion)) { ToastHelper.showToast("处罚意见还未填写", ToastHelper.WARING); return; } @@ -568,6 +575,9 @@ } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); + + //处理之后才能处罚，所以在处理之后才获取处罚时间 + punishTime = punishDateView.getText().toString(); } @Override @@ -575,8 +585,8 @@ if (resultBean.isSuccess()) { if (handleResult.equals("处理完成")) { //只有选择处理完成才需要操作处罚流程 -// casePunishPresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(punishImageList), approvalResult); + packageHandlePresenter.onReadyRetrofitRequest(id, StringHelper.StringToType(punishType), + punishOpinion, punishTime, StringHelper.reformatURL(punishImageList)); } else { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); @@ -586,6 +596,15 @@ } } + @Override + public void obtainPackageHandleResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); + PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + PackageHandledFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + finish(); + } + } @Override protected void onDestroy() { @@ -602,5 +621,8 @@ if (caseHandlePresenter != null) { caseHandlePresenter.disposeRetrofitRequest(); } + if (packageHandlePresenter != null) { + packageHandlePresenter.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 916ad06..d84b4ca 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.presenter.CaseHandledListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; +import com.casic.dcms.mvp.presenter.CaseListHandledPresenterImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseHandledFragment extends BaseFragment implements ICaseHandledListView { +public class CaseHandledFragment extends BaseFragment implements ICaseListHandledView { private static final String TAG = "CaseHandledFragment"; private Context context; @@ -45,7 +45,7 @@ RecyclerView caseRecyclerView; private int pageIndex = 1; - private CaseHandledListPresenterImpl caseHandledListPresenter; + private CaseListHandledPresenterImpl caseHandledListPresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseHandledListPresenterImpl(this); + caseHandledListPresenter = new CaseListHandledPresenterImpl(this); caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); 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 a8e7cc6..4bf5491 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseTodoFragment extends BaseFragment implements ICaseHandleListView { +public class CaseTodoFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "CaseTodoFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 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 index 8a14832..8e81bee 100644 --- 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class OvertimeCaseFragment extends BaseFragment implements ICaseHandleListView { +public class OvertimeCaseFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "OvertimeCaseFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 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 index edbad6e..24cc15a 100644 --- 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class UrgentCaseFragment extends BaseFragment implements ICaseHandleListView { +public class UrgentCaseFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "UrgentCaseFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index a16229b..f9244ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -14,8 +14,8 @@ import com.casic.dcms.adapter.PackageHandledAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.presenter.PackageHandledPresenterImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; +import com.casic.dcms.mvp.presenter.PackageListHandledPresenterImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; import com.casic.dcms.ui.PackageHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -34,7 +34,7 @@ /** * TODO 仅搭建界面，数据还未完全绑定 */ -public class PackageHandledFragment extends BaseFragment implements IPackageHandledView { +public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @BindView(R.id.emptyView) @@ -44,7 +44,7 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageHandledPresenterImpl handledPresenter; + private PackageListHandledPresenterImpl handledPresenter; private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; @@ -63,7 +63,7 @@ @Override protected void initData() { - handledPresenter = new PackageHandledPresenterImpl(this); + handledPresenter = new PackageListHandledPresenterImpl(this); handledPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index a4c2584..2a15e22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -14,8 +14,8 @@ import com.casic.dcms.adapter.PackageTodoAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.presenter.PackageTodoPresenterImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; +import com.casic.dcms.mvp.presenter.PackageListTodoPresenterImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; import com.casic.dcms.ui.PackageTodoDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -34,7 +34,7 @@ /** * TODO 仅搭建界面，数据还未完全绑定 */ -public class PackageTodoFragment extends BaseFragment implements IPackageTodoView { +public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; private Context context; @@ -45,7 +45,7 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageTodoPresenterImpl todoPresenter; + private PackageListTodoPresenterImpl todoPresenter; private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; @@ -64,7 +64,7 @@ @Override protected void initData() { - todoPresenter = new PackageTodoPresenterImpl(this); + todoPresenter = new PackageListTodoPresenterImpl(this); todoPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e7ddeba..320d7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; @@ -59,7 +59,7 @@ import cn.jzvd.JzvdStd; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, - IUploadFileView, ICaseNextNodeView, ICaseHandleView { + IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) 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 22b83e8..84e1c73 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -27,7 +27,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -63,7 +63,7 @@ import cn.jzvd.JzvdStd; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) 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 d88d6f3..ca2ff5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; import com.casic.dcms.mvp.presenter.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; +import com.casic.dcms.mvp.presenter.CaseListHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseCheckView; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -59,7 +59,7 @@ import butterknife.BindView; public class CaseOnMapActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseHandleListView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; @BindView(R.id.topLayout) @@ -75,7 +75,7 @@ @BindView(R.id.checkRadioButton) RadioButton checkRadioButton; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -123,7 +123,7 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 2ab7451..d55539b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -31,7 +31,7 @@ import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -67,7 +67,7 @@ import cn.jzvd.JzvdStd; public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 3b57d7b..e3c6a54 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -145,6 +145,34 @@ }); imageAdapter.setDeleteView(false); } + + //处罚记录 + punishTypeView.setText(StringHelper.TypeToString(data.getPunishType())); + punishOpinionView.setText(StringHelper.filterString(data.getPunishRemarks())); + String punishImages = data.getPunishImage(); + if (!TextUtils.isEmpty(punishImages)) { + ArrayList urls = new ArrayList<>(); + String[] split = punishImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); + punishRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + punishDateView.setText(data.getPunishTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index f971c57..c77c3cf 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -25,10 +25,12 @@ import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; +import com.casic.dcms.mvp.presenter.PackageHandlePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; @@ -60,7 +62,7 @@ import butterknife.OnClick; public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; @@ -129,6 +131,10 @@ private String id;//案卷id private CaseHandlePresenterImpl caseHandlePresenter; private String handleResult; + private PackageHandlePresenterImpl packageHandlePresenter; + private String punishOpinion; + private String punishType;//处罚类型文字 + private String punishTime; @Override public int initLayoutView() { @@ -164,6 +170,7 @@ caseHandleRecyclerView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); + packageHandlePresenter = new PackageHandlePresenterImpl(this); } @Override @@ -245,7 +252,7 @@ @Override public void obtainDataFail() { - ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + ToastHelper.showToast("操作失败", ToastHelper.ERROR); } @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addHandleImageView, R.id.punishHandleLayout, @@ -548,13 +555,13 @@ return; } //只有选择处理完成才需要判断处罚条件 - String punishType = punishTypeView.getText().toString().trim().replace(" ", ""); + punishType = punishTypeView.getText().toString(); if (TextUtils.isEmpty(punishType)) { ToastHelper.showToast("处罚类型还未选择", ToastHelper.WARING); return; } - String punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(punishType)) { + punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(punishOpinion)) { ToastHelper.showToast("处罚意见还未填写", ToastHelper.WARING); return; } @@ -568,6 +575,9 @@ } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); + + //处理之后才能处罚，所以在处理之后才获取处罚时间 + punishTime = punishDateView.getText().toString(); } @Override @@ -575,8 +585,8 @@ if (resultBean.isSuccess()) { if (handleResult.equals("处理完成")) { //只有选择处理完成才需要操作处罚流程 -// casePunishPresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(punishImageList), approvalResult); + packageHandlePresenter.onReadyRetrofitRequest(id, StringHelper.StringToType(punishType), + punishOpinion, punishTime, StringHelper.reformatURL(punishImageList)); } else { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); @@ -586,6 +596,15 @@ } } + @Override + public void obtainPackageHandleResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); + PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + PackageHandledFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + finish(); + } + } @Override protected void onDestroy() { @@ -602,5 +621,8 @@ if (caseHandlePresenter != null) { caseHandlePresenter.disposeRetrofitRequest(); } + if (packageHandlePresenter != null) { + packageHandlePresenter.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 916ad06..d84b4ca 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.presenter.CaseHandledListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; +import com.casic.dcms.mvp.presenter.CaseListHandledPresenterImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseHandledFragment extends BaseFragment implements ICaseHandledListView { +public class CaseHandledFragment extends BaseFragment implements ICaseListHandledView { private static final String TAG = "CaseHandledFragment"; private Context context; @@ -45,7 +45,7 @@ RecyclerView caseRecyclerView; private int pageIndex = 1; - private CaseHandledListPresenterImpl caseHandledListPresenter; + private CaseListHandledPresenterImpl caseHandledListPresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseHandledListPresenterImpl(this); + caseHandledListPresenter = new CaseListHandledPresenterImpl(this); caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); 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 a8e7cc6..4bf5491 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseTodoFragment extends BaseFragment implements ICaseHandleListView { +public class CaseTodoFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "CaseTodoFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 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 index 8a14832..8e81bee 100644 --- 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class OvertimeCaseFragment extends BaseFragment implements ICaseHandleListView { +public class OvertimeCaseFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "OvertimeCaseFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 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 index edbad6e..24cc15a 100644 --- 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class UrgentCaseFragment extends BaseFragment implements ICaseHandleListView { +public class UrgentCaseFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "UrgentCaseFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index a16229b..f9244ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -14,8 +14,8 @@ import com.casic.dcms.adapter.PackageHandledAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.presenter.PackageHandledPresenterImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; +import com.casic.dcms.mvp.presenter.PackageListHandledPresenterImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; import com.casic.dcms.ui.PackageHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -34,7 +34,7 @@ /** * TODO 仅搭建界面，数据还未完全绑定 */ -public class PackageHandledFragment extends BaseFragment implements IPackageHandledView { +public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @BindView(R.id.emptyView) @@ -44,7 +44,7 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageHandledPresenterImpl handledPresenter; + private PackageListHandledPresenterImpl handledPresenter; private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; @@ -63,7 +63,7 @@ @Override protected void initData() { - handledPresenter = new PackageHandledPresenterImpl(this); + handledPresenter = new PackageListHandledPresenterImpl(this); handledPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index a4c2584..2a15e22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -14,8 +14,8 @@ import com.casic.dcms.adapter.PackageTodoAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.presenter.PackageTodoPresenterImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; +import com.casic.dcms.mvp.presenter.PackageListTodoPresenterImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; import com.casic.dcms.ui.PackageTodoDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -34,7 +34,7 @@ /** * TODO 仅搭建界面，数据还未完全绑定 */ -public class PackageTodoFragment extends BaseFragment implements IPackageTodoView { +public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; private Context context; @@ -45,7 +45,7 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageTodoPresenterImpl todoPresenter; + private PackageListTodoPresenterImpl todoPresenter; private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; @@ -64,7 +64,7 @@ @Override protected void initData() { - todoPresenter = new PackageTodoPresenterImpl(this); + todoPresenter = new PackageListTodoPresenterImpl(this); todoPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index cf7ddec..1c77ddd 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -176,6 +176,44 @@ } /** + * 三包处罚转换 + */ + public static String StringToType(String s) { + String punishType = ""; + switch (s) { + case "劝导": + punishType = "1"; + break; + case "警告": + punishType = "2"; + break; + case "处罚": + punishType = "3"; + break; + } + return punishType; + } + + /** + * 三包处罚转换 + */ + public static String TypeToString(String type) { + String s = ""; + switch (type) { + case "1": + s = "劝导"; + break; + case "2": + s = "警告"; + break; + case "3": + s = "处罚"; + break; + } + return s; + } + + /** * 根据item名字获取icon */ public static int obtainIcon(String item) { diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e7ddeba..320d7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; @@ -59,7 +59,7 @@ import cn.jzvd.JzvdStd; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, - IUploadFileView, ICaseNextNodeView, ICaseHandleView { + IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) 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 22b83e8..84e1c73 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -27,7 +27,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -63,7 +63,7 @@ import cn.jzvd.JzvdStd; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) 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 d88d6f3..ca2ff5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; import com.casic.dcms.mvp.presenter.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; +import com.casic.dcms.mvp.presenter.CaseListHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseCheckView; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -59,7 +59,7 @@ import butterknife.BindView; public class CaseOnMapActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseHandleListView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; @BindView(R.id.topLayout) @@ -75,7 +75,7 @@ @BindView(R.id.checkRadioButton) RadioButton checkRadioButton; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -123,7 +123,7 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 2ab7451..d55539b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -31,7 +31,7 @@ import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -67,7 +67,7 @@ import cn.jzvd.JzvdStd; public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 3b57d7b..e3c6a54 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -145,6 +145,34 @@ }); imageAdapter.setDeleteView(false); } + + //处罚记录 + punishTypeView.setText(StringHelper.TypeToString(data.getPunishType())); + punishOpinionView.setText(StringHelper.filterString(data.getPunishRemarks())); + String punishImages = data.getPunishImage(); + if (!TextUtils.isEmpty(punishImages)) { + ArrayList urls = new ArrayList<>(); + String[] split = punishImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); + punishRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + punishDateView.setText(data.getPunishTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index f971c57..c77c3cf 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -25,10 +25,12 @@ import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; +import com.casic.dcms.mvp.presenter.PackageHandlePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; @@ -60,7 +62,7 @@ import butterknife.OnClick; public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; @@ -129,6 +131,10 @@ private String id;//案卷id private CaseHandlePresenterImpl caseHandlePresenter; private String handleResult; + private PackageHandlePresenterImpl packageHandlePresenter; + private String punishOpinion; + private String punishType;//处罚类型文字 + private String punishTime; @Override public int initLayoutView() { @@ -164,6 +170,7 @@ caseHandleRecyclerView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); + packageHandlePresenter = new PackageHandlePresenterImpl(this); } @Override @@ -245,7 +252,7 @@ @Override public void obtainDataFail() { - ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + ToastHelper.showToast("操作失败", ToastHelper.ERROR); } @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addHandleImageView, R.id.punishHandleLayout, @@ -548,13 +555,13 @@ return; } //只有选择处理完成才需要判断处罚条件 - String punishType = punishTypeView.getText().toString().trim().replace(" ", ""); + punishType = punishTypeView.getText().toString(); if (TextUtils.isEmpty(punishType)) { ToastHelper.showToast("处罚类型还未选择", ToastHelper.WARING); return; } - String punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(punishType)) { + punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(punishOpinion)) { ToastHelper.showToast("处罚意见还未填写", ToastHelper.WARING); return; } @@ -568,6 +575,9 @@ } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); + + //处理之后才能处罚，所以在处理之后才获取处罚时间 + punishTime = punishDateView.getText().toString(); } @Override @@ -575,8 +585,8 @@ if (resultBean.isSuccess()) { if (handleResult.equals("处理完成")) { //只有选择处理完成才需要操作处罚流程 -// casePunishPresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(punishImageList), approvalResult); + packageHandlePresenter.onReadyRetrofitRequest(id, StringHelper.StringToType(punishType), + punishOpinion, punishTime, StringHelper.reformatURL(punishImageList)); } else { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); @@ -586,6 +596,15 @@ } } + @Override + public void obtainPackageHandleResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); + PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + PackageHandledFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + finish(); + } + } @Override protected void onDestroy() { @@ -602,5 +621,8 @@ if (caseHandlePresenter != null) { caseHandlePresenter.disposeRetrofitRequest(); } + if (packageHandlePresenter != null) { + packageHandlePresenter.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 916ad06..d84b4ca 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.presenter.CaseHandledListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; +import com.casic.dcms.mvp.presenter.CaseListHandledPresenterImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseHandledFragment extends BaseFragment implements ICaseHandledListView { +public class CaseHandledFragment extends BaseFragment implements ICaseListHandledView { private static final String TAG = "CaseHandledFragment"; private Context context; @@ -45,7 +45,7 @@ RecyclerView caseRecyclerView; private int pageIndex = 1; - private CaseHandledListPresenterImpl caseHandledListPresenter; + private CaseListHandledPresenterImpl caseHandledListPresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseHandledListPresenterImpl(this); + caseHandledListPresenter = new CaseListHandledPresenterImpl(this); caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); 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 a8e7cc6..4bf5491 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseTodoFragment extends BaseFragment implements ICaseHandleListView { +public class CaseTodoFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "CaseTodoFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 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 index 8a14832..8e81bee 100644 --- 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class OvertimeCaseFragment extends BaseFragment implements ICaseHandleListView { +public class OvertimeCaseFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "OvertimeCaseFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 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 index edbad6e..24cc15a 100644 --- 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class UrgentCaseFragment extends BaseFragment implements ICaseHandleListView { +public class UrgentCaseFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "UrgentCaseFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index a16229b..f9244ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -14,8 +14,8 @@ import com.casic.dcms.adapter.PackageHandledAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.presenter.PackageHandledPresenterImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; +import com.casic.dcms.mvp.presenter.PackageListHandledPresenterImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; import com.casic.dcms.ui.PackageHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -34,7 +34,7 @@ /** * TODO 仅搭建界面，数据还未完全绑定 */ -public class PackageHandledFragment extends BaseFragment implements IPackageHandledView { +public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @BindView(R.id.emptyView) @@ -44,7 +44,7 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageHandledPresenterImpl handledPresenter; + private PackageListHandledPresenterImpl handledPresenter; private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; @@ -63,7 +63,7 @@ @Override protected void initData() { - handledPresenter = new PackageHandledPresenterImpl(this); + handledPresenter = new PackageListHandledPresenterImpl(this); handledPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index a4c2584..2a15e22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -14,8 +14,8 @@ import com.casic.dcms.adapter.PackageTodoAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.presenter.PackageTodoPresenterImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; +import com.casic.dcms.mvp.presenter.PackageListTodoPresenterImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; import com.casic.dcms.ui.PackageTodoDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -34,7 +34,7 @@ /** * TODO 仅搭建界面，数据还未完全绑定 */ -public class PackageTodoFragment extends BaseFragment implements IPackageTodoView { +public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; private Context context; @@ -45,7 +45,7 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageTodoPresenterImpl todoPresenter; + private PackageListTodoPresenterImpl todoPresenter; private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; @@ -64,7 +64,7 @@ @Override protected void initData() { - todoPresenter = new PackageTodoPresenterImpl(this); + todoPresenter = new PackageListTodoPresenterImpl(this); todoPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index cf7ddec..1c77ddd 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -176,6 +176,44 @@ } /** + * 三包处罚转换 + */ + public static String StringToType(String s) { + String punishType = ""; + switch (s) { + case "劝导": + punishType = "1"; + break; + case "警告": + punishType = "2"; + break; + case "处罚": + punishType = "3"; + break; + } + return punishType; + } + + /** + * 三包处罚转换 + */ + public static String TypeToString(String type) { + String s = ""; + switch (type) { + case "1": + s = "劝导"; + break; + case "2": + s = "警告"; + break; + case "3": + s = "处罚"; + break; + } + return s; + } + + /** * 根据item名字获取icon */ public static int obtainIcon(String item) { 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 e491c51..72d1965 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 @@ -289,13 +289,16 @@ /** * 处理待办分页查询 - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 + * + * @param isOvertime 是否超时,null-所有案卷,1-超时案卷 + * @param isEmergent 是否紧急,null-所有案卷,1-紧急案卷 + * @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); @@ -497,4 +500,18 @@ @Query("isShop") String isShop, @Query("limit") int limit, @Query("offset") int offset); + + /** + * 三包处罚 + *

+ * http://111.198.10.15:11409/case/update + */ + @FormUrlEncoded + @POST("/case/update") + Observable handlePackageCase(@Header("token") String token, + @Field("id") String id, + @Field("punishType") String punishType, + @Field("punishRemarks") String punishRemarks, + @Field("punishTime") String punishTime, + @Field("punishImage") String punishImage); } diff --git a/app/build.gradle b/app/build.gradle index 7ede907..6f0b518 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 18 - versionName "v1.0.0.10" + versionCode 19 + versionName "v1.0.0.11" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java index 192c96c..ff17962 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseDetailBean.java @@ -42,6 +42,79 @@ } public static class DataBean { + /** + * bzhours : 8 + * isNeedRevisit : 0 + * registerRemarks : 调查后请及时回复 + * createUserName : 彭先洪 + * source : 2 + * reporterName : + * casetypeName : 公共设施 + * audioIdCheck : + * areaName : 崇仁县 + * caseState : 301 + * punishType : 2 + * checkPersonName : + * communityName : 中大社区 + * superviseRemarks : + * videoIdCheck : + * lat : 27.757868294564336 + * superviseUserid : + * caseStateName : 处理完成 + * lng : 116.06351929174009 + * isOvertime : 0 + * superviseUserName : + * bzminis : 0 + * verifyPersonName : + * audioIdProcess : + * fileIdVerify : 2021-06\536af68ab91741c18d749c0b8a752f88.png,2021-06\6489d6d16e874ab096947e1d0acf84f3.png + * casetypeDetailCode : 04 + * isUrge : 0 + * onedeptid : 1177028662545973250 + * checkPersonId : + * fileIdCheck : + * areaCode : 361024 + * videoIdProcess : + * caseid : 202106170004 + * caseLevelName : 一般 + * nodeLimittime : 2021-06-19 10:03:14 + * gridId : 361024100005001 + * punishRemarks : 脏乱差，警告一次 + * reporterPhone : + * processPersonid : 1188725016870416385 + * casetypesTimeId : 1400411300586729473 + * isSupervise : 0 + * description : 三包案卷暂时别处理 + * urgeUserid : + * casetypesTimeName : 雨水篦子破损 + * audioIdVerify : + * eorcName : 部件 + * casetypeDetailName : 雨水箅子 + * streetName : 巴山镇 + * processId : 2890624 + * reportSupervisorName : + * caseLevel : 1 + * shopPhone : 15397679784 + * verifyPersonId : + * fieldintro : 汽车修理厂 + * processPersonName : + * streetCode : 361024100 + * urgeRemarks : + * videoIdVerify : + * shopkeeperName : 李四 + * eorc : 2 + * punishTime : 2021-06-17 09:26:23 + * createTime : 2021-06-17 08:52:28 + * casetypeCode : 01 + * punishImage : 2021-06\c0e6a51273d24e18a4957eadc360f0f7.png,2021-06\e2090003884b4ffab628c41065e62ba8.png + * processRemarks : + * createUser : 1177050541084160002 + * sourceName : 终端-普通上报 + * fileIdProcess : 2021-06\d43284ce59934735a6de2971364db320.png,2021-06\b955114e2b924525b1e4c23e9988adef.png + * communityCode : 361024100005 + * onedeptName : 桥南中队 + */ + private int bzhours; private int isNeedRevisit; private String registerRemarks; @@ -52,6 +125,7 @@ private String audioIdCheck; private String areaName; private int caseState; + private String punishType; private String checkPersonName; private String communityName; private String superviseRemarks; @@ -67,7 +141,7 @@ private String audioIdProcess; private String fileIdVerify; private String casetypeDetailCode; - private String isUrge; + private int isUrge; private String onedeptid; private String checkPersonId; private String fileIdCheck; @@ -77,6 +151,7 @@ private String caseLevelName; private String nodeLimittime; private String gridId; + private String punishRemarks; private String reporterPhone; private String processPersonid; private String casetypesTimeId; @@ -100,13 +175,16 @@ private String videoIdVerify; private String shopkeeperName; private String eorc; + private String punishTime; private String createTime; private String casetypeCode; + private String punishImage; private String processRemarks; private String createUser; private String sourceName; private String fileIdProcess; private String communityCode; + private String onedeptName; public int getBzhours() { return bzhours; @@ -188,6 +266,14 @@ this.caseState = caseState; } + public String getPunishType() { + return punishType; + } + + public void setPunishType(String punishType) { + this.punishType = punishType; + } + public String getCheckPersonName() { return checkPersonName; } @@ -308,11 +394,11 @@ this.casetypeDetailCode = casetypeDetailCode; } - public String getIsUrge() { + public int getIsUrge() { return isUrge; } - public void setIsUrge(String isUrge) { + public void setIsUrge(int isUrge) { this.isUrge = isUrge; } @@ -388,6 +474,14 @@ this.gridId = gridId; } + public String getPunishRemarks() { + return punishRemarks; + } + + public void setPunishRemarks(String punishRemarks) { + this.punishRemarks = punishRemarks; + } + public String getReporterPhone() { return reporterPhone; } @@ -572,6 +666,14 @@ this.eorc = eorc; } + public String getPunishTime() { + return punishTime; + } + + public void setPunishTime(String punishTime) { + this.punishTime = punishTime; + } + public String getCreateTime() { return createTime; } @@ -588,6 +690,14 @@ this.casetypeCode = casetypeCode; } + public String getPunishImage() { + return punishImage; + } + + public void setPunishImage(String punishImage) { + this.punishImage = punishImage; + } + public String getProcessRemarks() { return processRemarks; } @@ -627,5 +737,13 @@ public void setCommunityCode(String communityCode) { this.communityCode = communityCode; } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java deleted file mode 100644 index b9ee099..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandleBean; -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 OnGetCaseHandleListListener listener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener caseHandleListListener) { - this.listener = caseHandleListListener; - } - - public interface OnGetCaseHandleListListener { - void onSuccess(CaseHandleBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java deleted file mode 100644 index 902564e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.CaseHandledBean; -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 CaseHandledListModelImpl implements ICaseHandledListModel { - - private OnGetCaseHandledListListener listener; - - public CaseHandledListModelImpl(OnGetCaseHandledListListener caseHandledListListener) { - this.listener = caseHandledListListener; - } - - public interface OnGetCaseHandledListListener { - void onSuccess(CaseHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java new file mode 100644 index 0000000..e019fe5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandleModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandleBean; +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 CaseListHandleModelImpl implements ICaseHandleListModel { + + private OnGetCaseHandleListListener listener; + + public CaseListHandleModelImpl(OnGetCaseHandleListListener caseHandleListListener) { + this.listener = caseHandleListListener; + } + + public interface OnGetCaseHandleListListener { + void onSuccess(CaseHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java new file mode 100644 index 0000000..3f5687b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.CaseHandledBean; +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 CaseListHandledModelImpl implements ICaseHandledListModel { + + private OnGetCaseHandledListListener listener; + + public CaseListHandledModelImpl(OnGetCaseHandledListListener caseHandledListListener) { + this.listener = caseHandledListListener; + } + + public interface OnGetCaseHandledListListener { + void onSuccess(CaseHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCaseHandledListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java new file mode 100644 index 0000000..7de5a6b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandleModel.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPackageHandleModel { + Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java new file mode 100644 index 0000000..b0f4a28 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandleModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +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 PackageHandleModelImpl implements IPackageHandleModel { + + private OnPackageHandleListener listener; + + public PackageHandleModelImpl(OnPackageHandleListener handleListener) { + this.listener = handleListener; + } + + public interface OnPackageHandleListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, + punishRemarks, punishTime, punishImage); + 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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java deleted file mode 100644 index 4806ed8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -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 PackageHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java new file mode 100644 index 0000000..5e36209 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageHandledBean; +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 PackageListHandledModelImpl implements IPackageHandledModel { + + private OnGetHandledListListener listener; + + public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PackageHandledBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageHandledBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java new file mode 100644 index 0000000..993668b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PackageTodoBean; +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 PackageListTodoModelImpl implements IPackageTodoModel { + + private OnGetTodoListListener listener; + + public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PackageTodoBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(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) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PackageTodoBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java deleted file mode 100644 index 6294ba2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -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 PackageTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(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) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java deleted file mode 100644 index 3ac2473..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandleListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandleListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; - -public class CaseHandleListPresenterImpl extends BasePresenter implements ICaseHandleListPresenter, - CaseHandleListModelImpl.OnGetCaseHandleListListener { - - private ICaseHandleListView view; - private CaseHandleListModelImpl actionModel; - - public CaseHandleListPresenterImpl(ICaseHandleListView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 531e666..1c9f1af 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseHandleModelImpl; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseHandlePresenterImpl extends BasePresenter implements ICaseHandlePresenter, CaseHandleModelImpl.OnHandleListener { - private ICaseHandleView view; + private ICaseDetailHandleView view; private CaseHandleModelImpl actionModel; - public CaseHandlePresenterImpl(ICaseHandleView caseHandleView) { + public CaseHandlePresenterImpl(ICaseDetailHandleView caseHandleView) { this.view = caseHandleView; actionModel = new CaseHandleModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java deleted file mode 100644 index e50c696..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandledListPresenterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.CaseHandledListModelImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; - -public class CaseHandledListPresenterImpl extends BasePresenter implements ICaseHandledListPresenter, - CaseHandledListModelImpl.OnGetCaseHandledListListener { - - private ICaseHandledListView view; - private CaseHandledListModelImpl actionModel; - - public CaseHandledListPresenterImpl(ICaseHandledListView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java new file mode 100644 index 0000000..7f6442a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandlePresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandleModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandleView; + +public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, + CaseListHandleModelImpl.OnGetCaseHandleListListener { + + private ICaseListHandleView view; + private CaseListHandleModelImpl actionModel; + + public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { + this.view = caseHandleListView; + actionModel = new CaseListHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java new file mode 100644 index 0000000..561fd78 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListHandledPresenterImpl.java @@ -0,0 +1,38 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.CaseListHandledModelImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; + +public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, + CaseListHandledModelImpl.OnGetCaseHandledListListener { + + private ICaseListHandledView view; + private CaseListHandledModelImpl actionModel; + + public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { + this.view = caseHandledListView; + actionModel = new CaseListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(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/ICaseHandleListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java deleted file mode 100644 index 110e8dc..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandleListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandleListPresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java deleted file mode 100644 index 663a484..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseHandledListPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseHandledListPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} 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 new file mode 100644 index 0000000..d290ada --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java @@ -0,0 +1,7 @@ +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/ICaseListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java new file mode 100644 index 0000000..2c96550 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java new file mode 100644 index 0000000..1364777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandlePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageHandlePresenter { + void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, String punishImage); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java deleted file mode 100644 index a9bf3cd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java new file mode 100644 index 0000000..dab0ea8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListHandledPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java new file mode 100644 index 0000000..8821dc6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPackageListTodoPresenter { + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java deleted file mode 100644 index 282542c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java new file mode 100644 index 0000000..58373da --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandlePresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageHandleModelImpl; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; + +public class PackageHandlePresenterImpl extends BasePresenter implements IPackageHandlePresenter, + PackageHandleModelImpl.OnPackageHandleListener { + + private IPackageDetailHandleView view; + private PackageHandleModelImpl actionModel; + + public PackageHandlePresenterImpl(IPackageDetailHandleView packageDetailHandleView) { + this.view = packageDetailHandleView; + actionModel = new PackageHandleModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String id, String punishType, String punishRemarks, String punishTime, + String punishImage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(id, punishType, punishRemarks, punishTime, punishImage)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainPackageHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java deleted file mode 100644 index 8bb8c03..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; - -public class PackageHandledPresenterImpl extends BasePresenter implements IPackageHandledPresenter, PackageHandledModelImpl.OnGetHandledListListener { - - private IPackageHandledView view; - private PackageHandledModelImpl actionModel; - - public PackageHandledPresenterImpl(IPackageHandledView handledView) { - this.view = handledView; - actionModel = new PackageHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java new file mode 100644 index 0000000..46f9946 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageHandledBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListHandledModelImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; + +public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { + + private IPackageLIstHandledView view; + private PackageListHandledModelImpl actionModel; + + public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { + this.view = handledView; + actionModel = new PackageListHandledModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageHandledBean resultBean) { + view.obtainPackageHandledResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java new file mode 100644 index 0000000..342af16 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java @@ -0,0 +1,37 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PackageTodoBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PackageListTodoModelImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; + +public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { + + private IPackageListTodoView view; + private PackageListTodoModelImpl actionModel; + + public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { + this.view = packageTodoView; + actionModel = new PackageListTodoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.sendRetrofitRequest(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PackageTodoBean resultBean) { + view.obtainPackageTodoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java deleted file mode 100644 index 90014f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; - -public class PackageTodoPresenterImpl extends BasePresenter implements IPackageTodoPresenter, PackageTodoModelImpl.OnGetTodoListListener { - - private IPackageTodoView view; - private PackageTodoModelImpl actionModel; - - public PackageTodoPresenterImpl(IPackageTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java new file mode 100644 index 0000000..9d233ab --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java deleted file mode 100644 index 95a5c49..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseHandleListView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java deleted file mode 100644 index 892ea5d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseHandleView { - void showProgress(); - - void hideProgress(); - - void obtainCaseHandleResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java deleted file mode 100644 index fa2e2e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandledListView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandledBean; - -public interface ICaseHandledListView { - void obtainCaseHandledList(CaseHandledBean resultBean); -} 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 new file mode 100644 index 0000000..d7a89ec --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java @@ -0,0 +1,7 @@ +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/ICaseListHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java new file mode 100644 index 0000000..e019cac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandledBean; + +public interface ICaseListHandledView { + void obtainCaseHandledList(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java new file mode 100644 index 0000000..346eac3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageDetailHandleView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IPackageDetailHandleView { + void showProgress(); + + void hideProgress(); + + void obtainPackageHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java deleted file mode 100644 index 09c4283..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java new file mode 100644 index 0000000..525942d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageHandledBean; + +public interface IPackageLIstHandledView { + void obtainPackageHandledResult(PackageHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java new file mode 100644 index 0000000..822e1ac --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PackageTodoBean; + +public interface IPackageListTodoView { + void obtainPackageTodoResult(PackageTodoBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java deleted file mode 100644 index 2e06e62..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e7ddeba..320d7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -25,7 +25,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.check.CaseCheckFragment; @@ -59,7 +59,7 @@ import cn.jzvd.JzvdStd; public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, - IUploadFileView, ICaseNextNodeView, ICaseHandleView { + IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = CaseCheckDetailActivity.this; @BindView(R.id.caseNumberView) 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 22b83e8..84e1c73 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -27,7 +27,7 @@ import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; @@ -63,7 +63,7 @@ import cn.jzvd.JzvdStd; public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseHandleView { + ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { private Context context = CaseHandleDetailActivity.this; @BindView(R.id.caseNumberView) 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 d88d6f3..ca2ff5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; import com.casic.dcms.mvp.presenter.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; +import com.casic.dcms.mvp.presenter.CaseListHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseVerifyPresenterImpl; import com.casic.dcms.mvp.view.ICaseCheckView; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -59,7 +59,7 @@ import butterknife.BindView; public class CaseOnMapActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseHandleListView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, ICaseVerifyView, ICaseCheckView { private static final String TAG = "CaseOnMapActivity"; @BindView(R.id.topLayout) @@ -75,7 +75,7 @@ @BindView(R.id.checkRadioButton) RadioButton checkRadioButton; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseVerifyPresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -123,7 +123,7 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); caseVerifyPresenter = new CaseVerifyPresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 2ab7451..d55539b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -31,7 +31,7 @@ import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.ICaseSmallClassView; @@ -67,7 +67,7 @@ import cn.jzvd.JzvdStd; public class CaseVerifyDetailActivity extends BaseCaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { private Context context = this; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 3b57d7b..e3c6a54 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -145,6 +145,34 @@ }); imageAdapter.setDeleteView(false); } + + //处罚记录 + punishTypeView.setText(StringHelper.TypeToString(data.getPunishType())); + punishOpinionView.setText(StringHelper.filterString(data.getPunishRemarks())); + String punishImages = data.getPunishImage(); + if (!TextUtils.isEmpty(punishImages)) { + ArrayList urls = new ArrayList<>(); + String[] split = punishImages.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg") || s.contains("png")) { + urls.add(StringHelper.appendCompleteURL(s)); + } + } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); + punishRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); + } + punishDateView.setText(data.getPunishTime()); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index f971c57..c77c3cf 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -25,10 +25,12 @@ import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.CaseHandlePresenterImpl; import com.casic.dcms.mvp.presenter.CaseNextNodePresenterImpl; +import com.casic.dcms.mvp.presenter.PackageHandlePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseHandleView; import com.casic.dcms.mvp.view.ICaseNextNodeView; +import com.casic.dcms.mvp.view.IPackageDetailHandleView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; @@ -60,7 +62,7 @@ import butterknife.OnClick; public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseHandleView { + ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; @@ -129,6 +131,10 @@ private String id;//案卷id private CaseHandlePresenterImpl caseHandlePresenter; private String handleResult; + private PackageHandlePresenterImpl packageHandlePresenter; + private String punishOpinion; + private String punishType;//处罚类型文字 + private String punishTime; @Override public int initLayoutView() { @@ -164,6 +170,7 @@ caseHandleRecyclerView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); + packageHandlePresenter = new PackageHandlePresenterImpl(this); } @Override @@ -245,7 +252,7 @@ @Override public void obtainDataFail() { - ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + ToastHelper.showToast("操作失败", ToastHelper.ERROR); } @OnClick({R.id.locationMapView, R.id.caseHandleResultLayout, R.id.addHandleImageView, R.id.punishHandleLayout, @@ -548,13 +555,13 @@ return; } //只有选择处理完成才需要判断处罚条件 - String punishType = punishTypeView.getText().toString().trim().replace(" ", ""); + punishType = punishTypeView.getText().toString(); if (TextUtils.isEmpty(punishType)) { ToastHelper.showToast("处罚类型还未选择", ToastHelper.WARING); return; } - String punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(punishType)) { + punishOpinion = punishOpinionView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(punishOpinion)) { ToastHelper.showToast("处罚意见还未填写", ToastHelper.WARING); return; } @@ -568,6 +575,9 @@ } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); + + //处理之后才能处罚，所以在处理之后才获取处罚时间 + punishTime = punishDateView.getText().toString(); } @Override @@ -575,8 +585,8 @@ if (resultBean.isSuccess()) { if (handleResult.equals("处理完成")) { //只有选择处理完成才需要操作处罚流程 -// casePunishPresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), -// changeState, caseReason, StringHelper.reformatURL(punishImageList), approvalResult); + packageHandlePresenter.onReadyRetrofitRequest(id, StringHelper.StringToType(punishType), + punishOpinion, punishTime, StringHelper.reformatURL(punishImageList)); } else { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); @@ -586,6 +596,15 @@ } } + @Override + public void obtainPackageHandleResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); + PackageTodoFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + PackageHandledFragment.sendEmptyMessage(Constant.PACKAGE_DONE); + finish(); + } + } @Override protected void onDestroy() { @@ -602,5 +621,8 @@ if (caseHandlePresenter != null) { caseHandlePresenter.disposeRetrofitRequest(); } + if (packageHandlePresenter != null) { + packageHandlePresenter.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 916ad06..d84b4ca 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.mvp.presenter.CaseHandledListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandledListView; +import com.casic.dcms.mvp.presenter.CaseListHandledPresenterImpl; +import com.casic.dcms.mvp.view.ICaseListHandledView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseHandledFragment extends BaseFragment implements ICaseHandledListView { +public class CaseHandledFragment extends BaseFragment implements ICaseListHandledView { private static final String TAG = "CaseHandledFragment"; private Context context; @@ -45,7 +45,7 @@ RecyclerView caseRecyclerView; private int pageIndex = 1; - private CaseHandledListPresenterImpl caseHandledListPresenter; + private CaseListHandledPresenterImpl caseHandledListPresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseHandledListPresenterImpl(this); + caseHandledListPresenter = new CaseListHandledPresenterImpl(this); caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); 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 a8e7cc6..4bf5491 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseTodoFragment extends BaseFragment implements ICaseHandleListView { +public class CaseTodoFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "CaseTodoFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 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 index 8a14832..8e81bee 100644 --- 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class OvertimeCaseFragment extends BaseFragment implements ICaseHandleListView { +public class OvertimeCaseFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "OvertimeCaseFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 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 index edbad6e..24cc15a 100644 --- 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 @@ -16,8 +16,8 @@ import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.mvp.presenter.CaseHandleListPresenterImpl; -import com.casic.dcms.mvp.view.ICaseHandleListView; +import com.casic.dcms.mvp.presenter.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; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class UrgentCaseFragment extends BaseFragment implements ICaseHandleListView { +public class UrgentCaseFragment extends BaseFragment implements ICaseListHandleView { private static final String TAG = "UrgentCaseFragment"; private Context context; @@ -47,7 +47,7 @@ private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseHandleListPresenterImpl caseHandleListPresenter; + private CaseListHandlePresenterImpl caseHandleListPresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -63,7 +63,7 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseHandleListPresenterImpl(this); + caseHandleListPresenter = new CaseListHandlePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index a16229b..f9244ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -14,8 +14,8 @@ import com.casic.dcms.adapter.PackageHandledAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.presenter.PackageHandledPresenterImpl; -import com.casic.dcms.mvp.view.IPackageHandledView; +import com.casic.dcms.mvp.presenter.PackageListHandledPresenterImpl; +import com.casic.dcms.mvp.view.IPackageLIstHandledView; import com.casic.dcms.ui.PackageHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -34,7 +34,7 @@ /** * TODO 仅搭建界面，数据还未完全绑定 */ -public class PackageHandledFragment extends BaseFragment implements IPackageHandledView { +public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @BindView(R.id.emptyView) @@ -44,7 +44,7 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageHandledPresenterImpl handledPresenter; + private PackageListHandledPresenterImpl handledPresenter; private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; @@ -63,7 +63,7 @@ @Override protected void initData() { - handledPresenter = new PackageHandledPresenterImpl(this); + handledPresenter = new PackageListHandledPresenterImpl(this); handledPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index a4c2584..2a15e22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -14,8 +14,8 @@ import com.casic.dcms.adapter.PackageTodoAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.presenter.PackageTodoPresenterImpl; -import com.casic.dcms.mvp.view.IPackageTodoView; +import com.casic.dcms.mvp.presenter.PackageListTodoPresenterImpl; +import com.casic.dcms.mvp.view.IPackageListTodoView; import com.casic.dcms.ui.PackageTodoDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -34,7 +34,7 @@ /** * TODO 仅搭建界面，数据还未完全绑定 */ -public class PackageTodoFragment extends BaseFragment implements IPackageTodoView { +public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; private Context context; @@ -45,7 +45,7 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageTodoPresenterImpl todoPresenter; + private PackageListTodoPresenterImpl todoPresenter; private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; @@ -64,7 +64,7 @@ @Override protected void initData() { - todoPresenter = new PackageTodoPresenterImpl(this); + todoPresenter = new PackageListTodoPresenterImpl(this); todoPresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index cf7ddec..1c77ddd 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -176,6 +176,44 @@ } /** + * 三包处罚转换 + */ + public static String StringToType(String s) { + String punishType = ""; + switch (s) { + case "劝导": + punishType = "1"; + break; + case "警告": + punishType = "2"; + break; + case "处罚": + punishType = "3"; + break; + } + return punishType; + } + + /** + * 三包处罚转换 + */ + public static String TypeToString(String type) { + String s = ""; + switch (type) { + case "1": + s = "劝导"; + break; + case "2": + s = "警告"; + break; + case "3": + s = "处罚"; + break; + } + return s; + } + + /** * 根据item名字获取icon */ public static int obtainIcon(String item) { 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 e491c51..72d1965 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 @@ -289,13 +289,16 @@ /** * 处理待办分页查询 - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 + * + * @param isOvertime 是否超时,null-所有案卷,1-超时案卷 + * @param isEmergent 是否紧急,null-所有案卷,1-紧急案卷 + * @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); @@ -497,4 +500,18 @@ @Query("isShop") String isShop, @Query("limit") int limit, @Query("offset") int offset); + + /** + * 三包处罚 + *

+ * http://111.198.10.15:11409/case/update + */ + @FormUrlEncoded + @POST("/case/update") + Observable handlePackageCase(@Header("token") String token, + @Field("id") String id, + @Field("punishType") String punishType, + @Field("punishRemarks") String punishRemarks, + @Field("punishTime") String punishTime, + @Field("punishImage") String punishImage); } 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 9e9ff8d..1c45c05 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 @@ -341,13 +341,13 @@ } /** - * 案卷处理分页查询 + * 案卷处理分页查询，去掉三包类型的案卷 */ public static Observable getCaseHandleListResult(String isOvertime, String isEmergent, int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainHandleCase(AuthenticationHelper.getToken(), isOvertime, isEmergent, limit, offset); + return service.obtainHandleCase(AuthenticationHelper.getToken(), isOvertime, isEmergent, "0", limit, offset); } /** @@ -534,4 +534,16 @@ RetrofitService service = retrofit.create(RetrofitService.class); return service.obtainCompletedListPage(AuthenticationHelper.getToken(), "1", 15, offset); } + + /** + * 三包处罚 + */ + public static Observable getHandlePackageResult(String id, String punishType, + String punishRemarks, String punishTime, + String punishImage) { + Retrofit retrofit = createRetrofit(); + RetrofitService service = retrofit.create(RetrofitService.class); + return service.handlePackageCase(AuthenticationHelper.getToken(), id, punishType, punishRemarks, + punishTime, punishImage); + } }