diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 0030f57..f02a4d7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -59,7 +59,7 @@ noticeBean.setTitle(resultBean.getTitle()); noticeBean.setContent(resultBean.getContent()); noticeBean.setType(resultBean.getType()); - noticeBean.setPushDate(TimeOrDateUtil.timestampToDate(System.currentTimeMillis())); + noticeBean.setPushDate(TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss")); noticeBean.setIsRead("1"); //存本地一份 diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 0030f57..f02a4d7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -59,7 +59,7 @@ noticeBean.setTitle(resultBean.getTitle()); noticeBean.setContent(resultBean.getContent()); noticeBean.setType(resultBean.getType()); - noticeBean.setPushDate(TimeOrDateUtil.timestampToDate(System.currentTimeMillis())); + noticeBean.setPushDate(TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss")); noticeBean.setIsRead("1"); //存本地一份 diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index 1a8331a..fbee6b8 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -55,8 +55,7 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(10);//控制两幅图之间的间距 - imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 0030f57..f02a4d7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -59,7 +59,7 @@ noticeBean.setTitle(resultBean.getTitle()); noticeBean.setContent(resultBean.getContent()); noticeBean.setType(resultBean.getType()); - noticeBean.setPushDate(TimeOrDateUtil.timestampToDate(System.currentTimeMillis())); + noticeBean.setPushDate(TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss")); noticeBean.setIsRead("1"); //存本地一份 diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index 1a8331a..fbee6b8 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -55,8 +55,7 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(10);//控制两幅图之间的间距 - imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { 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 6a93d0f..1d99092 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -438,6 +438,7 @@ checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); checkImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 0030f57..f02a4d7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -59,7 +59,7 @@ noticeBean.setTitle(resultBean.getTitle()); noticeBean.setContent(resultBean.getContent()); noticeBean.setType(resultBean.getType()); - noticeBean.setPushDate(TimeOrDateUtil.timestampToDate(System.currentTimeMillis())); + noticeBean.setPushDate(TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss")); noticeBean.setIsRead("1"); //存本地一份 diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index 1a8331a..fbee6b8 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -55,8 +55,7 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(10);//控制两幅图之间的间距 - imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { 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 6a93d0f..1d99092 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -438,6 +438,7 @@ checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); checkImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 951b765..72b2ccf 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -449,6 +449,7 @@ handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); handleImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 0030f57..f02a4d7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -59,7 +59,7 @@ noticeBean.setTitle(resultBean.getTitle()); noticeBean.setContent(resultBean.getContent()); noticeBean.setType(resultBean.getType()); - noticeBean.setPushDate(TimeOrDateUtil.timestampToDate(System.currentTimeMillis())); + noticeBean.setPushDate(TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss")); noticeBean.setIsRead("1"); //存本地一份 diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index 1a8331a..fbee6b8 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -55,8 +55,7 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(10);//控制两幅图之间的间距 - imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { 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 6a93d0f..1d99092 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -438,6 +438,7 @@ checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); checkImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 951b765..72b2ccf 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -449,6 +449,7 @@ handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); handleImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 703d1b1..9deac4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -86,15 +86,15 @@ .create(); caseListPresenter = new CaseListPresenterImpl(this); weakReferenceHandler = new WeakReferenceHandler(this); + eorc = getIntent().getStringExtra("eorc"); typeCode = getIntent().getStringExtra("typeCode"); typeDetailCode = getIntent().getStringExtra("typeDetailCode"); caseState = getIntent().getStringExtra("caseState"); startTime = getIntent().getStringExtra("startTime"); endTime = getIntent().getStringExtra("endTime"); - eorc = getIntent().getStringExtra("eorc"); //加载第一页 - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, pageIndex); } @Override diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 0030f57..f02a4d7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -59,7 +59,7 @@ noticeBean.setTitle(resultBean.getTitle()); noticeBean.setContent(resultBean.getContent()); noticeBean.setType(resultBean.getType()); - noticeBean.setPushDate(TimeOrDateUtil.timestampToDate(System.currentTimeMillis())); + noticeBean.setPushDate(TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss")); noticeBean.setIsRead("1"); //存本地一份 diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index 1a8331a..fbee6b8 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -55,8 +55,7 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(10);//控制两幅图之间的间距 - imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { 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 6a93d0f..1d99092 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -438,6 +438,7 @@ checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); checkImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 951b765..72b2ccf 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -449,6 +449,7 @@ handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); handleImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 703d1b1..9deac4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -86,15 +86,15 @@ .create(); caseListPresenter = new CaseListPresenterImpl(this); weakReferenceHandler = new WeakReferenceHandler(this); + eorc = getIntent().getStringExtra("eorc"); typeCode = getIntent().getStringExtra("typeCode"); typeDetailCode = getIntent().getStringExtra("typeDetailCode"); caseState = getIntent().getStringExtra("caseState"); startTime = getIntent().getStringExtra("startTime"); endTime = getIntent().getStringExtra("endTime"); - eorc = getIntent().getStringExtra("eorc"); //加载第一页 - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index a28c249..568a21f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -63,10 +63,10 @@ private CaseSmallClassPresenterImpl caseSmallClassPresenter; private List smallClassBeans; private CaseStatusPresenterImpl caseStatusPresenter; - private String typeCode; - private String typeDetailCode; - private String caseState; - private String eorc; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = ""; + private String caseState = ""; @Override public int initLayoutView() { @@ -116,8 +116,9 @@ caseClassView.setText(tag); caseClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); + eorc = String.valueOf(position + 1); //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + caseLargeClassPresenter.onReadyRetrofitRequest(eorc); } }).build().show(); break; @@ -139,7 +140,6 @@ //获取案卷小类 CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -181,7 +181,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyyy-MM-dd"); startTimeView.setText(date); startTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -196,7 +196,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endTimeView.setText(date); endTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -204,12 +204,12 @@ break; case R.id.searchButton: Intent intent = new Intent(this, CaseListResultActivity.class); + intent.putExtra("eorc", eorc); intent.putExtra("typeCode", typeCode); intent.putExtra("typeDetailCode", typeDetailCode); intent.putExtra("caseState", caseState); intent.putExtra("startTime", startTimeView.getText().toString()); intent.putExtra("endTime", endTimeView.getText().toString()); - intent.putExtra("eorc", eorc); startActivity(intent); break; case R.id.resetButton: diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 0030f57..f02a4d7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -59,7 +59,7 @@ noticeBean.setTitle(resultBean.getTitle()); noticeBean.setContent(resultBean.getContent()); noticeBean.setType(resultBean.getType()); - noticeBean.setPushDate(TimeOrDateUtil.timestampToDate(System.currentTimeMillis())); + noticeBean.setPushDate(TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss")); noticeBean.setIsRead("1"); //存本地一份 diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index 1a8331a..fbee6b8 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -55,8 +55,7 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(10);//控制两幅图之间的间距 - imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { 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 6a93d0f..1d99092 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -438,6 +438,7 @@ checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); checkImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 951b765..72b2ccf 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -449,6 +449,7 @@ handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); handleImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 703d1b1..9deac4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -86,15 +86,15 @@ .create(); caseListPresenter = new CaseListPresenterImpl(this); weakReferenceHandler = new WeakReferenceHandler(this); + eorc = getIntent().getStringExtra("eorc"); typeCode = getIntent().getStringExtra("typeCode"); typeDetailCode = getIntent().getStringExtra("typeDetailCode"); caseState = getIntent().getStringExtra("caseState"); startTime = getIntent().getStringExtra("startTime"); endTime = getIntent().getStringExtra("endTime"); - eorc = getIntent().getStringExtra("eorc"); //加载第一页 - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index a28c249..568a21f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -63,10 +63,10 @@ private CaseSmallClassPresenterImpl caseSmallClassPresenter; private List smallClassBeans; private CaseStatusPresenterImpl caseStatusPresenter; - private String typeCode; - private String typeDetailCode; - private String caseState; - private String eorc; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = ""; + private String caseState = ""; @Override public int initLayoutView() { @@ -116,8 +116,9 @@ caseClassView.setText(tag); caseClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); + eorc = String.valueOf(position + 1); //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + caseLargeClassPresenter.onReadyRetrofitRequest(eorc); } }).build().show(); break; @@ -139,7 +140,6 @@ //获取案卷小类 CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -181,7 +181,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyyy-MM-dd"); startTimeView.setText(date); startTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -196,7 +196,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endTimeView.setText(date); endTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -204,12 +204,12 @@ break; case R.id.searchButton: Intent intent = new Intent(this, CaseListResultActivity.class); + intent.putExtra("eorc", eorc); intent.putExtra("typeCode", typeCode); intent.putExtra("typeDetailCode", typeDetailCode); intent.putExtra("caseState", caseState); intent.putExtra("startTime", startTimeView.getText().toString()); intent.putExtra("endTime", endTimeView.getText().toString()); - intent.putExtra("eorc", eorc); startActivity(intent); break; case R.id.resetButton: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 27d3a6f..b1adeb9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -193,7 +193,7 @@ @Override public void onUpdate(double db, long time) { recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); + recodeTextView.setText(TimeOrDateUtil.timestampToTime(time)); } @Override @@ -591,6 +591,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 0030f57..f02a4d7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -59,7 +59,7 @@ noticeBean.setTitle(resultBean.getTitle()); noticeBean.setContent(resultBean.getContent()); noticeBean.setType(resultBean.getType()); - noticeBean.setPushDate(TimeOrDateUtil.timestampToDate(System.currentTimeMillis())); + noticeBean.setPushDate(TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss")); noticeBean.setIsRead("1"); //存本地一份 diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index 1a8331a..fbee6b8 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -55,8 +55,7 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(10);//控制两幅图之间的间距 - imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { 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 6a93d0f..1d99092 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -438,6 +438,7 @@ checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); checkImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 951b765..72b2ccf 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -449,6 +449,7 @@ handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); handleImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 703d1b1..9deac4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -86,15 +86,15 @@ .create(); caseListPresenter = new CaseListPresenterImpl(this); weakReferenceHandler = new WeakReferenceHandler(this); + eorc = getIntent().getStringExtra("eorc"); typeCode = getIntent().getStringExtra("typeCode"); typeDetailCode = getIntent().getStringExtra("typeDetailCode"); caseState = getIntent().getStringExtra("caseState"); startTime = getIntent().getStringExtra("startTime"); endTime = getIntent().getStringExtra("endTime"); - eorc = getIntent().getStringExtra("eorc"); //加载第一页 - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index a28c249..568a21f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -63,10 +63,10 @@ private CaseSmallClassPresenterImpl caseSmallClassPresenter; private List smallClassBeans; private CaseStatusPresenterImpl caseStatusPresenter; - private String typeCode; - private String typeDetailCode; - private String caseState; - private String eorc; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = ""; + private String caseState = ""; @Override public int initLayoutView() { @@ -116,8 +116,9 @@ caseClassView.setText(tag); caseClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); + eorc = String.valueOf(position + 1); //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + caseLargeClassPresenter.onReadyRetrofitRequest(eorc); } }).build().show(); break; @@ -139,7 +140,6 @@ //获取案卷小类 CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -181,7 +181,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyyy-MM-dd"); startTimeView.setText(date); startTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -196,7 +196,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endTimeView.setText(date); endTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -204,12 +204,12 @@ break; case R.id.searchButton: Intent intent = new Intent(this, CaseListResultActivity.class); + intent.putExtra("eorc", eorc); intent.putExtra("typeCode", typeCode); intent.putExtra("typeDetailCode", typeDetailCode); intent.putExtra("caseState", caseState); intent.putExtra("startTime", startTimeView.getText().toString()); intent.putExtra("endTime", endTimeView.getText().toString()); - intent.putExtra("eorc", eorc); startActivity(intent); break; case R.id.resetButton: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 27d3a6f..b1adeb9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -193,7 +193,7 @@ @Override public void onUpdate(double db, long time) { recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); + recodeTextView.setText(TimeOrDateUtil.timestampToTime(time)); } @Override @@ -591,6 +591,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index b4d3bac..67a0340 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -369,6 +369,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 0030f57..f02a4d7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -59,7 +59,7 @@ noticeBean.setTitle(resultBean.getTitle()); noticeBean.setContent(resultBean.getContent()); noticeBean.setType(resultBean.getType()); - noticeBean.setPushDate(TimeOrDateUtil.timestampToDate(System.currentTimeMillis())); + noticeBean.setPushDate(TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss")); noticeBean.setIsRead("1"); //存本地一份 diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index 1a8331a..fbee6b8 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -55,8 +55,7 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(10);//控制两幅图之间的间距 - imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { 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 6a93d0f..1d99092 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -438,6 +438,7 @@ checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); checkImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 951b765..72b2ccf 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -449,6 +449,7 @@ handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); handleImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 703d1b1..9deac4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -86,15 +86,15 @@ .create(); caseListPresenter = new CaseListPresenterImpl(this); weakReferenceHandler = new WeakReferenceHandler(this); + eorc = getIntent().getStringExtra("eorc"); typeCode = getIntent().getStringExtra("typeCode"); typeDetailCode = getIntent().getStringExtra("typeDetailCode"); caseState = getIntent().getStringExtra("caseState"); startTime = getIntent().getStringExtra("startTime"); endTime = getIntent().getStringExtra("endTime"); - eorc = getIntent().getStringExtra("eorc"); //加载第一页 - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index a28c249..568a21f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -63,10 +63,10 @@ private CaseSmallClassPresenterImpl caseSmallClassPresenter; private List smallClassBeans; private CaseStatusPresenterImpl caseStatusPresenter; - private String typeCode; - private String typeDetailCode; - private String caseState; - private String eorc; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = ""; + private String caseState = ""; @Override public int initLayoutView() { @@ -116,8 +116,9 @@ caseClassView.setText(tag); caseClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); + eorc = String.valueOf(position + 1); //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + caseLargeClassPresenter.onReadyRetrofitRequest(eorc); } }).build().show(); break; @@ -139,7 +140,6 @@ //获取案卷小类 CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -181,7 +181,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyyy-MM-dd"); startTimeView.setText(date); startTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -196,7 +196,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endTimeView.setText(date); endTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -204,12 +204,12 @@ break; case R.id.searchButton: Intent intent = new Intent(this, CaseListResultActivity.class); + intent.putExtra("eorc", eorc); intent.putExtra("typeCode", typeCode); intent.putExtra("typeDetailCode", typeDetailCode); intent.putExtra("caseState", caseState); intent.putExtra("startTime", startTimeView.getText().toString()); intent.putExtra("endTime", endTimeView.getText().toString()); - intent.putExtra("eorc", eorc); startActivity(intent); break; case R.id.resetButton: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 27d3a6f..b1adeb9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -193,7 +193,7 @@ @Override public void onUpdate(double db, long time) { recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); + recodeTextView.setText(TimeOrDateUtil.timestampToTime(time)); } @Override @@ -591,6 +591,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index b4d3bac..67a0340 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -369,6 +369,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 396c7fb..f0e437a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -620,6 +620,7 @@ verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); verifyImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 0030f57..f02a4d7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -59,7 +59,7 @@ noticeBean.setTitle(resultBean.getTitle()); noticeBean.setContent(resultBean.getContent()); noticeBean.setType(resultBean.getType()); - noticeBean.setPushDate(TimeOrDateUtil.timestampToDate(System.currentTimeMillis())); + noticeBean.setPushDate(TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss")); noticeBean.setIsRead("1"); //存本地一份 diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index 1a8331a..fbee6b8 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -55,8 +55,7 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(10);//控制两幅图之间的间距 - imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { 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 6a93d0f..1d99092 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -438,6 +438,7 @@ checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); checkImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 951b765..72b2ccf 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -449,6 +449,7 @@ handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); handleImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 703d1b1..9deac4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -86,15 +86,15 @@ .create(); caseListPresenter = new CaseListPresenterImpl(this); weakReferenceHandler = new WeakReferenceHandler(this); + eorc = getIntent().getStringExtra("eorc"); typeCode = getIntent().getStringExtra("typeCode"); typeDetailCode = getIntent().getStringExtra("typeDetailCode"); caseState = getIntent().getStringExtra("caseState"); startTime = getIntent().getStringExtra("startTime"); endTime = getIntent().getStringExtra("endTime"); - eorc = getIntent().getStringExtra("eorc"); //加载第一页 - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index a28c249..568a21f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -63,10 +63,10 @@ private CaseSmallClassPresenterImpl caseSmallClassPresenter; private List smallClassBeans; private CaseStatusPresenterImpl caseStatusPresenter; - private String typeCode; - private String typeDetailCode; - private String caseState; - private String eorc; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = ""; + private String caseState = ""; @Override public int initLayoutView() { @@ -116,8 +116,9 @@ caseClassView.setText(tag); caseClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); + eorc = String.valueOf(position + 1); //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + caseLargeClassPresenter.onReadyRetrofitRequest(eorc); } }).build().show(); break; @@ -139,7 +140,6 @@ //获取案卷小类 CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -181,7 +181,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyyy-MM-dd"); startTimeView.setText(date); startTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -196,7 +196,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endTimeView.setText(date); endTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -204,12 +204,12 @@ break; case R.id.searchButton: Intent intent = new Intent(this, CaseListResultActivity.class); + intent.putExtra("eorc", eorc); intent.putExtra("typeCode", typeCode); intent.putExtra("typeDetailCode", typeDetailCode); intent.putExtra("caseState", caseState); intent.putExtra("startTime", startTimeView.getText().toString()); intent.putExtra("endTime", endTimeView.getText().toString()); - intent.putExtra("eorc", eorc); startActivity(intent); break; case R.id.resetButton: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 27d3a6f..b1adeb9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -193,7 +193,7 @@ @Override public void onUpdate(double db, long time) { recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); + recodeTextView.setText(TimeOrDateUtil.timestampToTime(time)); } @Override @@ -591,6 +591,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index b4d3bac..67a0340 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -369,6 +369,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 396c7fb..f0e437a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -620,6 +620,7 @@ verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); verifyImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java index e3703e3..7356d27 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -121,7 +121,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); startDateView.setText(date); SaveKeyValues.putValue("begTime", date); @@ -136,7 +136,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endDateView.setText(date); SaveKeyValues.putValue("endTime", date); diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 0030f57..f02a4d7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -59,7 +59,7 @@ noticeBean.setTitle(resultBean.getTitle()); noticeBean.setContent(resultBean.getContent()); noticeBean.setType(resultBean.getType()); - noticeBean.setPushDate(TimeOrDateUtil.timestampToDate(System.currentTimeMillis())); + noticeBean.setPushDate(TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss")); noticeBean.setIsRead("1"); //存本地一份 diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index 1a8331a..fbee6b8 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -55,8 +55,7 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(10);//控制两幅图之间的间距 - imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { 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 6a93d0f..1d99092 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -438,6 +438,7 @@ checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); checkImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 951b765..72b2ccf 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -449,6 +449,7 @@ handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); handleImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 703d1b1..9deac4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -86,15 +86,15 @@ .create(); caseListPresenter = new CaseListPresenterImpl(this); weakReferenceHandler = new WeakReferenceHandler(this); + eorc = getIntent().getStringExtra("eorc"); typeCode = getIntent().getStringExtra("typeCode"); typeDetailCode = getIntent().getStringExtra("typeDetailCode"); caseState = getIntent().getStringExtra("caseState"); startTime = getIntent().getStringExtra("startTime"); endTime = getIntent().getStringExtra("endTime"); - eorc = getIntent().getStringExtra("eorc"); //加载第一页 - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index a28c249..568a21f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -63,10 +63,10 @@ private CaseSmallClassPresenterImpl caseSmallClassPresenter; private List smallClassBeans; private CaseStatusPresenterImpl caseStatusPresenter; - private String typeCode; - private String typeDetailCode; - private String caseState; - private String eorc; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = ""; + private String caseState = ""; @Override public int initLayoutView() { @@ -116,8 +116,9 @@ caseClassView.setText(tag); caseClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); + eorc = String.valueOf(position + 1); //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + caseLargeClassPresenter.onReadyRetrofitRequest(eorc); } }).build().show(); break; @@ -139,7 +140,6 @@ //获取案卷小类 CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -181,7 +181,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyyy-MM-dd"); startTimeView.setText(date); startTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -196,7 +196,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endTimeView.setText(date); endTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -204,12 +204,12 @@ break; case R.id.searchButton: Intent intent = new Intent(this, CaseListResultActivity.class); + intent.putExtra("eorc", eorc); intent.putExtra("typeCode", typeCode); intent.putExtra("typeDetailCode", typeDetailCode); intent.putExtra("caseState", caseState); intent.putExtra("startTime", startTimeView.getText().toString()); intent.putExtra("endTime", endTimeView.getText().toString()); - intent.putExtra("eorc", eorc); startActivity(intent); break; case R.id.resetButton: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 27d3a6f..b1adeb9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -193,7 +193,7 @@ @Override public void onUpdate(double db, long time) { recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); + recodeTextView.setText(TimeOrDateUtil.timestampToTime(time)); } @Override @@ -591,6 +591,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index b4d3bac..67a0340 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -369,6 +369,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 396c7fb..f0e437a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -620,6 +620,7 @@ verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); verifyImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java index e3703e3..7356d27 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -121,7 +121,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); startDateView.setText(date); SaveKeyValues.putValue("begTime", date); @@ -136,7 +136,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endDateView.setText(date); SaveKeyValues.putValue("endTime", date); diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index d87994e..2596836 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -305,7 +305,7 @@ } double longitude = aMapLocation.getLongitude(); double latitude = aMapLocation.getLatitude(); - String cleanTime = TimeOrDateUtil.timestampToDate(System.currentTimeMillis()); + String cleanTime = TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss"); cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), String.valueOf(longitude), String.valueOf(latitude), cleanTime, imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 0030f57..f02a4d7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -59,7 +59,7 @@ noticeBean.setTitle(resultBean.getTitle()); noticeBean.setContent(resultBean.getContent()); noticeBean.setType(resultBean.getType()); - noticeBean.setPushDate(TimeOrDateUtil.timestampToDate(System.currentTimeMillis())); + noticeBean.setPushDate(TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss")); noticeBean.setIsRead("1"); //存本地一份 diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index 1a8331a..fbee6b8 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -55,8 +55,7 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(10);//控制两幅图之间的间距 - imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { 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 6a93d0f..1d99092 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -438,6 +438,7 @@ checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); checkImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 951b765..72b2ccf 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -449,6 +449,7 @@ handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); handleImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 703d1b1..9deac4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -86,15 +86,15 @@ .create(); caseListPresenter = new CaseListPresenterImpl(this); weakReferenceHandler = new WeakReferenceHandler(this); + eorc = getIntent().getStringExtra("eorc"); typeCode = getIntent().getStringExtra("typeCode"); typeDetailCode = getIntent().getStringExtra("typeDetailCode"); caseState = getIntent().getStringExtra("caseState"); startTime = getIntent().getStringExtra("startTime"); endTime = getIntent().getStringExtra("endTime"); - eorc = getIntent().getStringExtra("eorc"); //加载第一页 - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index a28c249..568a21f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -63,10 +63,10 @@ private CaseSmallClassPresenterImpl caseSmallClassPresenter; private List smallClassBeans; private CaseStatusPresenterImpl caseStatusPresenter; - private String typeCode; - private String typeDetailCode; - private String caseState; - private String eorc; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = ""; + private String caseState = ""; @Override public int initLayoutView() { @@ -116,8 +116,9 @@ caseClassView.setText(tag); caseClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); + eorc = String.valueOf(position + 1); //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + caseLargeClassPresenter.onReadyRetrofitRequest(eorc); } }).build().show(); break; @@ -139,7 +140,6 @@ //获取案卷小类 CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -181,7 +181,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyyy-MM-dd"); startTimeView.setText(date); startTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -196,7 +196,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endTimeView.setText(date); endTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -204,12 +204,12 @@ break; case R.id.searchButton: Intent intent = new Intent(this, CaseListResultActivity.class); + intent.putExtra("eorc", eorc); intent.putExtra("typeCode", typeCode); intent.putExtra("typeDetailCode", typeDetailCode); intent.putExtra("caseState", caseState); intent.putExtra("startTime", startTimeView.getText().toString()); intent.putExtra("endTime", endTimeView.getText().toString()); - intent.putExtra("eorc", eorc); startActivity(intent); break; case R.id.resetButton: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 27d3a6f..b1adeb9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -193,7 +193,7 @@ @Override public void onUpdate(double db, long time) { recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); + recodeTextView.setText(TimeOrDateUtil.timestampToTime(time)); } @Override @@ -591,6 +591,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index b4d3bac..67a0340 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -369,6 +369,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 396c7fb..f0e437a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -620,6 +620,7 @@ verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); verifyImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java index e3703e3..7356d27 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -121,7 +121,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); startDateView.setText(date); SaveKeyValues.putValue("begTime", date); @@ -136,7 +136,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endDateView.setText(date); SaveKeyValues.putValue("endTime", date); diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index d87994e..2596836 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -305,7 +305,7 @@ } double longitude = aMapLocation.getLongitude(); double latitude = aMapLocation.getLatitude(); - String cleanTime = TimeOrDateUtil.timestampToDate(System.currentTimeMillis()); + String cleanTime = TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss"); cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), String.valueOf(longitude), String.valueOf(latitude), cleanTime, imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java index 7faa01b..1ba1d5b 100644 --- a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java @@ -310,6 +310,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 0030f57..f02a4d7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -59,7 +59,7 @@ noticeBean.setTitle(resultBean.getTitle()); noticeBean.setContent(resultBean.getContent()); noticeBean.setType(resultBean.getType()); - noticeBean.setPushDate(TimeOrDateUtil.timestampToDate(System.currentTimeMillis())); + noticeBean.setPushDate(TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss")); noticeBean.setIsRead("1"); //存本地一份 diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index 1a8331a..fbee6b8 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -55,8 +55,7 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(10);//控制两幅图之间的间距 - imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { 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 6a93d0f..1d99092 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -438,6 +438,7 @@ checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); checkImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 951b765..72b2ccf 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -449,6 +449,7 @@ handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); handleImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 703d1b1..9deac4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -86,15 +86,15 @@ .create(); caseListPresenter = new CaseListPresenterImpl(this); weakReferenceHandler = new WeakReferenceHandler(this); + eorc = getIntent().getStringExtra("eorc"); typeCode = getIntent().getStringExtra("typeCode"); typeDetailCode = getIntent().getStringExtra("typeDetailCode"); caseState = getIntent().getStringExtra("caseState"); startTime = getIntent().getStringExtra("startTime"); endTime = getIntent().getStringExtra("endTime"); - eorc = getIntent().getStringExtra("eorc"); //加载第一页 - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index a28c249..568a21f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -63,10 +63,10 @@ private CaseSmallClassPresenterImpl caseSmallClassPresenter; private List smallClassBeans; private CaseStatusPresenterImpl caseStatusPresenter; - private String typeCode; - private String typeDetailCode; - private String caseState; - private String eorc; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = ""; + private String caseState = ""; @Override public int initLayoutView() { @@ -116,8 +116,9 @@ caseClassView.setText(tag); caseClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); + eorc = String.valueOf(position + 1); //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + caseLargeClassPresenter.onReadyRetrofitRequest(eorc); } }).build().show(); break; @@ -139,7 +140,6 @@ //获取案卷小类 CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -181,7 +181,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyyy-MM-dd"); startTimeView.setText(date); startTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -196,7 +196,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endTimeView.setText(date); endTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -204,12 +204,12 @@ break; case R.id.searchButton: Intent intent = new Intent(this, CaseListResultActivity.class); + intent.putExtra("eorc", eorc); intent.putExtra("typeCode", typeCode); intent.putExtra("typeDetailCode", typeDetailCode); intent.putExtra("caseState", caseState); intent.putExtra("startTime", startTimeView.getText().toString()); intent.putExtra("endTime", endTimeView.getText().toString()); - intent.putExtra("eorc", eorc); startActivity(intent); break; case R.id.resetButton: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 27d3a6f..b1adeb9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -193,7 +193,7 @@ @Override public void onUpdate(double db, long time) { recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); + recodeTextView.setText(TimeOrDateUtil.timestampToTime(time)); } @Override @@ -591,6 +591,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index b4d3bac..67a0340 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -369,6 +369,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 396c7fb..f0e437a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -620,6 +620,7 @@ verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); verifyImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java index e3703e3..7356d27 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -121,7 +121,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); startDateView.setText(date); SaveKeyValues.putValue("begTime", date); @@ -136,7 +136,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endDateView.setText(date); SaveKeyValues.putValue("endTime", date); diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index d87994e..2596836 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -305,7 +305,7 @@ } double longitude = aMapLocation.getLongitude(); double latitude = aMapLocation.getLatitude(); - String cleanTime = TimeOrDateUtil.timestampToDate(System.currentTimeMillis()); + String cleanTime = TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss"); cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), String.valueOf(longitude), String.valueOf(latitude), cleanTime, imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java index 7faa01b..1ba1d5b 100644 --- a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java @@ -310,6 +310,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index fa6b3be..72ccfdb 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,8 @@ package com.casic.dcms.utils; -import java.text.ParseException; +import android.annotation.SuppressLint; + import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; /** @@ -10,59 +10,29 @@ * @time : 2021/4/15 16:54 * @email : 290677893@qq.com **/ +@SuppressLint("SimpleDateFormat") public class TimeOrDateUtil { - private static final String TAG = "TimeOrDateUtil"; - private static final SimpleDateFormat allDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - private static final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss"); - private static final SimpleDateFormat millsFormat = new SimpleDateFormat("mm:ss"); + /** + * 时间戳转时间 + */ + public static String timestampToTime(String formatStr) { + SimpleDateFormat millsFormat = new SimpleDateFormat(formatStr); + return millsFormat.format(new Date()); + } /** * 时间戳转时间 */ - public static String millsToTime(long millSeconds) { - return millsFormat.format(new Date(millSeconds)); + public static String timestampToTime(long mills) { + SimpleDateFormat millsFormat = new SimpleDateFormat("mm:ss"); + return millsFormat.format(mills); } /** * 时间戳转日期 */ - public static String rTimestampToDate(long millSeconds) { - return dateFormat.format(new Date(millSeconds)); - } - - /** - * 时间戳转时间 - */ - public static String timestampToTime(long millSeconds) { - return timeFormat.format(new Date(millSeconds)); - } - - /** - * 时间戳转详细日期时间 - */ - public static String timestampToDate(long millSeconds) { - return allDateFormat.format(new Date(millSeconds)); - } - - /** - * 时间转时间戳 - */ - public static long dateToTimestamp(String time) { - try { - return allDateFormat.parse(time).getTime(); - } catch (ParseException e) { - e.printStackTrace(); - } - return 0L; - } - - /** - * 获取当前日期 - */ - public static String getCurrentDate() { - Calendar calendar = Calendar.getInstance(); - long today = calendar.getTimeInMillis(); - return rTimestampToDate(today); + public static String timestampToDate(String formatStr) { + SimpleDateFormat millsFormat = new SimpleDateFormat(formatStr); + return millsFormat.format(new Date()); } } diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 0030f57..f02a4d7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -59,7 +59,7 @@ noticeBean.setTitle(resultBean.getTitle()); noticeBean.setContent(resultBean.getContent()); noticeBean.setType(resultBean.getType()); - noticeBean.setPushDate(TimeOrDateUtil.timestampToDate(System.currentTimeMillis())); + noticeBean.setPushDate(TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss")); noticeBean.setIsRead("1"); //存本地一份 diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index 1a8331a..fbee6b8 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -55,8 +55,7 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(10);//控制两幅图之间的间距 - imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { 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 6a93d0f..1d99092 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -438,6 +438,7 @@ checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); checkImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 951b765..72b2ccf 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -449,6 +449,7 @@ handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); handleImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 703d1b1..9deac4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -86,15 +86,15 @@ .create(); caseListPresenter = new CaseListPresenterImpl(this); weakReferenceHandler = new WeakReferenceHandler(this); + eorc = getIntent().getStringExtra("eorc"); typeCode = getIntent().getStringExtra("typeCode"); typeDetailCode = getIntent().getStringExtra("typeDetailCode"); caseState = getIntent().getStringExtra("caseState"); startTime = getIntent().getStringExtra("startTime"); endTime = getIntent().getStringExtra("endTime"); - eorc = getIntent().getStringExtra("eorc"); //加载第一页 - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index a28c249..568a21f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -63,10 +63,10 @@ private CaseSmallClassPresenterImpl caseSmallClassPresenter; private List smallClassBeans; private CaseStatusPresenterImpl caseStatusPresenter; - private String typeCode; - private String typeDetailCode; - private String caseState; - private String eorc; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = ""; + private String caseState = ""; @Override public int initLayoutView() { @@ -116,8 +116,9 @@ caseClassView.setText(tag); caseClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); + eorc = String.valueOf(position + 1); //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + caseLargeClassPresenter.onReadyRetrofitRequest(eorc); } }).build().show(); break; @@ -139,7 +140,6 @@ //获取案卷小类 CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -181,7 +181,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyyy-MM-dd"); startTimeView.setText(date); startTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -196,7 +196,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endTimeView.setText(date); endTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -204,12 +204,12 @@ break; case R.id.searchButton: Intent intent = new Intent(this, CaseListResultActivity.class); + intent.putExtra("eorc", eorc); intent.putExtra("typeCode", typeCode); intent.putExtra("typeDetailCode", typeDetailCode); intent.putExtra("caseState", caseState); intent.putExtra("startTime", startTimeView.getText().toString()); intent.putExtra("endTime", endTimeView.getText().toString()); - intent.putExtra("eorc", eorc); startActivity(intent); break; case R.id.resetButton: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 27d3a6f..b1adeb9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -193,7 +193,7 @@ @Override public void onUpdate(double db, long time) { recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); + recodeTextView.setText(TimeOrDateUtil.timestampToTime(time)); } @Override @@ -591,6 +591,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index b4d3bac..67a0340 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -369,6 +369,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 396c7fb..f0e437a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -620,6 +620,7 @@ verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); verifyImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java index e3703e3..7356d27 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -121,7 +121,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); startDateView.setText(date); SaveKeyValues.putValue("begTime", date); @@ -136,7 +136,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endDateView.setText(date); SaveKeyValues.putValue("endTime", date); diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index d87994e..2596836 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -305,7 +305,7 @@ } double longitude = aMapLocation.getLongitude(); double latitude = aMapLocation.getLatitude(); - String cleanTime = TimeOrDateUtil.timestampToDate(System.currentTimeMillis()); + String cleanTime = TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss"); cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), String.valueOf(longitude), String.valueOf(latitude), cleanTime, imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java index 7faa01b..1ba1d5b 100644 --- a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java @@ -310,6 +310,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index fa6b3be..72ccfdb 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,8 @@ package com.casic.dcms.utils; -import java.text.ParseException; +import android.annotation.SuppressLint; + import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; /** @@ -10,59 +10,29 @@ * @time : 2021/4/15 16:54 * @email : 290677893@qq.com **/ +@SuppressLint("SimpleDateFormat") public class TimeOrDateUtil { - private static final String TAG = "TimeOrDateUtil"; - private static final SimpleDateFormat allDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - private static final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss"); - private static final SimpleDateFormat millsFormat = new SimpleDateFormat("mm:ss"); + /** + * 时间戳转时间 + */ + public static String timestampToTime(String formatStr) { + SimpleDateFormat millsFormat = new SimpleDateFormat(formatStr); + return millsFormat.format(new Date()); + } /** * 时间戳转时间 */ - public static String millsToTime(long millSeconds) { - return millsFormat.format(new Date(millSeconds)); + public static String timestampToTime(long mills) { + SimpleDateFormat millsFormat = new SimpleDateFormat("mm:ss"); + return millsFormat.format(mills); } /** * 时间戳转日期 */ - public static String rTimestampToDate(long millSeconds) { - return dateFormat.format(new Date(millSeconds)); - } - - /** - * 时间戳转时间 - */ - public static String timestampToTime(long millSeconds) { - return timeFormat.format(new Date(millSeconds)); - } - - /** - * 时间戳转详细日期时间 - */ - public static String timestampToDate(long millSeconds) { - return allDateFormat.format(new Date(millSeconds)); - } - - /** - * 时间转时间戳 - */ - public static long dateToTimestamp(String time) { - try { - return allDateFormat.parse(time).getTime(); - } catch (ParseException e) { - e.printStackTrace(); - } - return 0L; - } - - /** - * 获取当前日期 - */ - public static String getCurrentDate() { - Calendar calendar = Calendar.getInstance(); - long today = calendar.getTimeInMillis(); - return rTimestampToDate(today); + public static String timestampToDate(String formatStr) { + SimpleDateFormat millsFormat = new SimpleDateFormat(formatStr); + return millsFormat.format(new Date()); } } 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 bbf2de9..04d396f 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 @@ -190,12 +190,12 @@ */ @GET("/case/queryListPage") Observable obtainCaseList(@Header("token") String token, + @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @Query("casetypeDetailCode") String casetypeDetailCode, @Query("caseState") String caseState, @Query("createTimeBegin") String createTimeBegin, @Query("createTimeEnd") String createTimeEnd, - @Query("eorc") String eorc, @Query("limit") int limit, @Query("offset") int offset); diff --git a/app/build.gradle b/app/build.gradle index 479c061..b8c1a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 13 - versionName "v1.0.0.5" + versionCode 14 + versionName "v1.0.0.6" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } @@ -97,5 +97,5 @@ //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 - implementation 'com.amap.api:location:latest.integration' + implementation 'com.amap.api:location:5.3.1' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 61f297f..f91fb83 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,10 +24,11 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset); + public Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { + Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 7215726..6e7121c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,7 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + Subscription sendRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 6fbac29..bddfa10 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,11 +16,12 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { + public void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, offset)); + addSubscription(actionModel.sendRetrofitRequest(eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, offset)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index fcdd09f..63f675f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,8 +1,9 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, - String registerTimeBegin, String registerTimeEnd, String eorc, int offset); + void onReadyRetrofitRequest(String eorc, String casetypeCode, String casetypeDetailCode, + String caseState, String registerTimeBegin, String registerTimeEnd, + int offset); void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 0030f57..f02a4d7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -59,7 +59,7 @@ noticeBean.setTitle(resultBean.getTitle()); noticeBean.setContent(resultBean.getContent()); noticeBean.setType(resultBean.getType()); - noticeBean.setPushDate(TimeOrDateUtil.timestampToDate(System.currentTimeMillis())); + noticeBean.setPushDate(TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss")); noticeBean.setIsRead("1"); //存本地一份 diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index 1a8331a..fbee6b8 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -55,8 +55,7 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(10);//控制两幅图之间的间距 - imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { 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 6a93d0f..1d99092 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -438,6 +438,7 @@ checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); checkImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 951b765..72b2ccf 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -449,6 +449,7 @@ handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); handleImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 703d1b1..9deac4e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -86,15 +86,15 @@ .create(); caseListPresenter = new CaseListPresenterImpl(this); weakReferenceHandler = new WeakReferenceHandler(this); + eorc = getIntent().getStringExtra("eorc"); typeCode = getIntent().getStringExtra("typeCode"); typeDetailCode = getIntent().getStringExtra("typeDetailCode"); caseState = getIntent().getStringExtra("caseState"); startTime = getIntent().getStringExtra("startTime"); endTime = getIntent().getStringExtra("endTime"); - eorc = getIntent().getStringExtra("eorc"); //加载第一页 - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index a28c249..568a21f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -63,10 +63,10 @@ private CaseSmallClassPresenterImpl caseSmallClassPresenter; private List smallClassBeans; private CaseStatusPresenterImpl caseStatusPresenter; - private String typeCode; - private String typeDetailCode; - private String caseState; - private String eorc; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = ""; + private String caseState = ""; @Override public int initLayoutView() { @@ -116,8 +116,9 @@ caseClassView.setText(tag); caseClassView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); + eorc = String.valueOf(position + 1); //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + caseLargeClassPresenter.onReadyRetrofitRequest(eorc); } }).build().show(); break; @@ -139,7 +140,6 @@ //获取案卷小类 CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -181,7 +181,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyyy-MM-dd"); startTimeView.setText(date); startTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -196,7 +196,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endTimeView.setText(date); endTimeView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); @@ -204,12 +204,12 @@ break; case R.id.searchButton: Intent intent = new Intent(this, CaseListResultActivity.class); + intent.putExtra("eorc", eorc); intent.putExtra("typeCode", typeCode); intent.putExtra("typeDetailCode", typeDetailCode); intent.putExtra("caseState", caseState); intent.putExtra("startTime", startTimeView.getText().toString()); intent.putExtra("endTime", endTimeView.getText().toString()); - intent.putExtra("eorc", eorc); startActivity(intent); break; case R.id.resetButton: diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 27d3a6f..b1adeb9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -193,7 +193,7 @@ @Override public void onUpdate(double db, long time) { recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); + recodeTextView.setText(TimeOrDateUtil.timestampToTime(time)); } @Override @@ -591,6 +591,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index b4d3bac..67a0340 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -369,6 +369,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + imageList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { 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 396c7fb..f0e437a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -620,6 +620,7 @@ verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); verifyImageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java index e3703e3..7356d27 100644 --- a/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DataAnalysisActivity.java @@ -121,7 +121,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); startDateView.setText(date); SaveKeyValues.putValue("begTime", date); @@ -136,7 +136,7 @@ .setMaxMillseconds(System.currentTimeMillis()) .setType(Type.YEAR_MONTH_DAY) .setCallBack((timePickerView, millSeconds) -> { - String date = TimeOrDateUtil.rTimestampToDate(millSeconds); + String date = TimeOrDateUtil.timestampToDate("yyy-MM-dd"); endDateView.setText(date); SaveKeyValues.putValue("endTime", date); diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index d87994e..2596836 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -305,7 +305,7 @@ } double longitude = aMapLocation.getLongitude(); double latitude = aMapLocation.getLatitude(); - String cleanTime = TimeOrDateUtil.timestampToDate(System.currentTimeMillis()); + String cleanTime = TimeOrDateUtil.timestampToDate("yyyy-MM-dd HH:mm:ss"); cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), String.valueOf(longitude), String.valueOf(latitude), cleanTime, imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java index 7faa01b..1ba1d5b 100644 --- a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java @@ -310,6 +310,7 @@ imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { + mediaList.remove(position); realPaths.remove(position); imageAdapter.setMediaList(realPaths); if (realPaths.size() != 2) { diff --git a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java index fa6b3be..72ccfdb 100644 --- a/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java +++ b/app/src/main/java/com/casic/dcms/utils/TimeOrDateUtil.java @@ -1,8 +1,8 @@ package com.casic.dcms.utils; -import java.text.ParseException; +import android.annotation.SuppressLint; + import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; /** @@ -10,59 +10,29 @@ * @time : 2021/4/15 16:54 * @email : 290677893@qq.com **/ +@SuppressLint("SimpleDateFormat") public class TimeOrDateUtil { - private static final String TAG = "TimeOrDateUtil"; - private static final SimpleDateFormat allDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - private static final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss"); - private static final SimpleDateFormat millsFormat = new SimpleDateFormat("mm:ss"); + /** + * 时间戳转时间 + */ + public static String timestampToTime(String formatStr) { + SimpleDateFormat millsFormat = new SimpleDateFormat(formatStr); + return millsFormat.format(new Date()); + } /** * 时间戳转时间 */ - public static String millsToTime(long millSeconds) { - return millsFormat.format(new Date(millSeconds)); + public static String timestampToTime(long mills) { + SimpleDateFormat millsFormat = new SimpleDateFormat("mm:ss"); + return millsFormat.format(mills); } /** * 时间戳转日期 */ - public static String rTimestampToDate(long millSeconds) { - return dateFormat.format(new Date(millSeconds)); - } - - /** - * 时间戳转时间 - */ - public static String timestampToTime(long millSeconds) { - return timeFormat.format(new Date(millSeconds)); - } - - /** - * 时间戳转详细日期时间 - */ - public static String timestampToDate(long millSeconds) { - return allDateFormat.format(new Date(millSeconds)); - } - - /** - * 时间转时间戳 - */ - public static long dateToTimestamp(String time) { - try { - return allDateFormat.parse(time).getTime(); - } catch (ParseException e) { - e.printStackTrace(); - } - return 0L; - } - - /** - * 获取当前日期 - */ - public static String getCurrentDate() { - Calendar calendar = Calendar.getInstance(); - long today = calendar.getTimeInMillis(); - return rTimestampToDate(today); + public static String timestampToDate(String formatStr) { + SimpleDateFormat millsFormat = new SimpleDateFormat(formatStr); + return millsFormat.format(new Date()); } } 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 bbf2de9..04d396f 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 @@ -190,12 +190,12 @@ */ @GET("/case/queryListPage") Observable obtainCaseList(@Header("token") String token, + @Query("eorc") String eorc, @Query("casetypeCode") String casetypeCode, @Query("casetypeDetailCode") String casetypeDetailCode, @Query("caseState") String caseState, @Query("createTimeBegin") String createTimeBegin, @Query("createTimeEnd") String createTimeEnd, - @Query("eorc") String eorc, @Query("limit") int limit, @Query("offset") int offset); diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 4f187c9..d2e73ee 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 @@ -216,13 +216,14 @@ /** * 根据时间查询案卷列表 */ - public static Observable getCaseListResult(String casetypeCode, String casetypeDetailCode, - String caseState, String registerTimeBegin, - String registerTimeEnd, String eorc, int offset) { + public static Observable getCaseListResult(String eorc, String casetypeCode, + String casetypeDetailCode, String caseState, + String registerTimeBegin, String registerTimeEnd, + int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseList(AuthenticationHelper.getToken(), casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, eorc, 15, offset); + return service.obtainCaseList(AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, + registerTimeBegin, registerTimeEnd, 15, offset); } /** @@ -299,8 +300,8 @@ Bitmap bitmap = BitmapFactory.decodeFile(image.getAbsolutePath()); String path = OtherUtils.drawTextToRightBottom(BaseApplication.getInstance(), bitmap, StringHelper.getUserAccount(), - TimeOrDateUtil.rTimestampToDate(System.currentTimeMillis()), - TimeOrDateUtil.timestampToTime(System.currentTimeMillis())); + TimeOrDateUtil.timestampToDate("yyy-MM-dd"), + TimeOrDateUtil.timestampToTime("HH:mm:ss")); Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class);