diff --git a/app/build.gradle b/app/build.gradle index 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/build.gradle b/app/build.gradle index 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index d2958f4..9f86e54 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -35,7 +34,7 @@ @Override public Subscription sendRetrofitRequest(SubmitInfoBean infoBean) { - Observable observable = RetrofitServiceManager.submitCase(HttpConfig.BASE_IP, infoBean); + Observable observable = RetrofitServiceManager.submitCase(infoBean); 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 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index d2958f4..9f86e54 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -35,7 +34,7 @@ @Override public Subscription sendRetrofitRequest(SubmitInfoBean infoBean) { - Observable observable = RetrofitServiceManager.submitCase(HttpConfig.BASE_IP, infoBean); + Observable observable = RetrofitServiceManager.submitCase(infoBean); 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/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index f48dbb9..cac6a2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(HttpConfig.BASE_IP, username, key); + Observable observable = RetrofitServiceManager.getTokenData(username, key); 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 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index d2958f4..9f86e54 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -35,7 +34,7 @@ @Override public Subscription sendRetrofitRequest(SubmitInfoBean infoBean) { - Observable observable = RetrofitServiceManager.submitCase(HttpConfig.BASE_IP, infoBean); + Observable observable = RetrofitServiceManager.submitCase(infoBean); 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/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index f48dbb9..cac6a2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(HttpConfig.BASE_IP, username, key); + Observable observable = RetrofitServiceManager.getTokenData(username, key); 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/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index a62efb8..e033292 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.UserBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getUserData(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.getUserData(); 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 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index d2958f4..9f86e54 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -35,7 +34,7 @@ @Override public Subscription sendRetrofitRequest(SubmitInfoBean infoBean) { - Observable observable = RetrofitServiceManager.submitCase(HttpConfig.BASE_IP, infoBean); + Observable observable = RetrofitServiceManager.submitCase(infoBean); 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/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index f48dbb9..cac6a2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(HttpConfig.BASE_IP, username, key); + Observable observable = RetrofitServiceManager.getTokenData(username, key); 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/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index a62efb8..e033292 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.UserBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getUserData(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.getUserData(); 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/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 9979749..7c2bbc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -144,7 +144,7 @@ infoBean.setFileIdVerify(""); infoBean.setBzhours(""); infoBean.setBzminis(""); - //定位 + //定位点经纬度 locationMap = new HashMap<>(); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override @@ -174,20 +174,12 @@ StringBuffer buffer = new StringBuffer(); try { Address address = geoCoder.getFromLocation(latitude, longitude, 1).get(0); -// Log.d(TAG, "getLocality: " + address.getLocality()); -// Log.d(TAG, "getSubLocality: " + address.getSubLocality()); -// Log.d(TAG, "getAdminArea: " + address.getAdminArea()); -// Log.d(TAG, "getSubAdminArea: " + address.getSubAdminArea()); -// Log.d(TAG, "getThoroughfare: " + address.getThoroughfare()); -// Log.d(TAG, "getSubThoroughfare: " + address.getSubThoroughfare()); buffer.append(address.getSubLocality()) .append(address.getSubAdminArea()) .append(address.getThoroughfare()) .append(address.getSubThoroughfare()); - // infoBean.setAreaCode(address.getSubLocality()); // infoBean.setStreetCode(address.getSubAdminArea()); - //保存经纬度，供地图页面定位 locationMap.put("longitude", longitude); locationMap.put("latitude", latitude); @@ -196,11 +188,6 @@ e.printStackTrace(); } communityNameView.setText(buffer); - -// CameraPosition cameraPosition = new CameraPosition(new LatLng(latitude, longitude), 15, 0, 30); -// CameraUpdate cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition); -// aMap.moveCamera(cameraUpdate); -// drawMarkers(latitude, longitude); } } @@ -390,7 +377,7 @@ @Override public void onItemClick(AdapterView parent, View view, int position, long id) { //查看大图 - showBigImage(selectList.get(position)); + showBigImage(selectList.get(position).getRealPath()); } }); //删除按钮点击事件 @@ -445,7 +432,7 @@ } } - private void showBigImage(LocalMedia localMedia) { + private void showBigImage(String path) { } diff --git a/app/build.gradle b/app/build.gradle index 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index d2958f4..9f86e54 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -35,7 +34,7 @@ @Override public Subscription sendRetrofitRequest(SubmitInfoBean infoBean) { - Observable observable = RetrofitServiceManager.submitCase(HttpConfig.BASE_IP, infoBean); + Observable observable = RetrofitServiceManager.submitCase(infoBean); 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/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index f48dbb9..cac6a2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(HttpConfig.BASE_IP, username, key); + Observable observable = RetrofitServiceManager.getTokenData(username, key); 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/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index a62efb8..e033292 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.UserBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getUserData(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.getUserData(); 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/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 9979749..7c2bbc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -144,7 +144,7 @@ infoBean.setFileIdVerify(""); infoBean.setBzhours(""); infoBean.setBzminis(""); - //定位 + //定位点经纬度 locationMap = new HashMap<>(); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override @@ -174,20 +174,12 @@ StringBuffer buffer = new StringBuffer(); try { Address address = geoCoder.getFromLocation(latitude, longitude, 1).get(0); -// Log.d(TAG, "getLocality: " + address.getLocality()); -// Log.d(TAG, "getSubLocality: " + address.getSubLocality()); -// Log.d(TAG, "getAdminArea: " + address.getAdminArea()); -// Log.d(TAG, "getSubAdminArea: " + address.getSubAdminArea()); -// Log.d(TAG, "getThoroughfare: " + address.getThoroughfare()); -// Log.d(TAG, "getSubThoroughfare: " + address.getSubThoroughfare()); buffer.append(address.getSubLocality()) .append(address.getSubAdminArea()) .append(address.getThoroughfare()) .append(address.getSubThoroughfare()); - // infoBean.setAreaCode(address.getSubLocality()); // infoBean.setStreetCode(address.getSubAdminArea()); - //保存经纬度，供地图页面定位 locationMap.put("longitude", longitude); locationMap.put("latitude", latitude); @@ -196,11 +188,6 @@ e.printStackTrace(); } communityNameView.setText(buffer); - -// CameraPosition cameraPosition = new CameraPosition(new LatLng(latitude, longitude), 15, 0, 30); -// CameraUpdate cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition); -// aMap.moveCamera(cameraUpdate); -// drawMarkers(latitude, longitude); } } @@ -390,7 +377,7 @@ @Override public void onItemClick(AdapterView parent, View view, int position, long id) { //查看大图 - showBigImage(selectList.get(position)); + showBigImage(selectList.get(position).getRealPath()); } }); //删除按钮点击事件 @@ -445,7 +432,7 @@ } } - private void showBigImage(LocalMedia localMedia) { + private void showBigImage(String path) { } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index d3d0fa1..979deff 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -16,10 +16,13 @@ import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; +import com.casic.dcms.widgets.InputDialog; +import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; @@ -43,6 +46,8 @@ CheckBox rememberPasswordView; @BindView(R.id.autoLoginView) CheckBox autoLoginView; + @BindView(R.id.changeServerConfigButton) + QMUIAlphaImageButton changeServerConfigButton; private QMUITipDialog loadingDialog; private AuthenticatePresenterImpl authenticatePresenter; @@ -87,15 +92,42 @@ @Override public void initEvent() { loginButton.setChangeAlphaWhenPress(true); + changeServerConfigButton.setChangeAlphaWhenPress(true); authenticatePresenter = new AuthenticatePresenterImpl(this); loginPresenter = new LoginPresenterImpl(this); } - @OnClick(R.id.loginButton) + @OnClick({R.id.loginButton, R.id.changeServerConfigButton}) @Override public void onClick(View v) { - //验证公钥 - authenticatePresenter.onReadyRetrofitRequest(); + switch (v.getId()) { + case R.id.loginButton: + //验证公钥 + authenticatePresenter.onReadyRetrofitRequest(); + break; + case R.id.changeServerConfigButton: + new InputDialog.Builder() + .setContext(this) + .setTitle("修改服务器地址和端口") + .setOnDialogClickListener(new InputDialog.OnDialogClickListener() { + @Override + public void onConfirmClick(String serverValue, String portValue) { + if (!TextUtils.isEmpty(serverValue) && !TextUtils.isEmpty(portValue)) { + String serverConfig = "http:" + serverValue + ":" + portValue; + SaveKeyValues.putValue(Constant.IP_KEY, serverConfig); + ToastHelper.showToast("服务器地址修改成功", ToastHelper.SUCCESS); + } + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + break; + default: + break; + } } @Override diff --git a/app/build.gradle b/app/build.gradle index 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index d2958f4..9f86e54 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -35,7 +34,7 @@ @Override public Subscription sendRetrofitRequest(SubmitInfoBean infoBean) { - Observable observable = RetrofitServiceManager.submitCase(HttpConfig.BASE_IP, infoBean); + Observable observable = RetrofitServiceManager.submitCase(infoBean); 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/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index f48dbb9..cac6a2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(HttpConfig.BASE_IP, username, key); + Observable observable = RetrofitServiceManager.getTokenData(username, key); 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/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index a62efb8..e033292 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.UserBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getUserData(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.getUserData(); 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/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 9979749..7c2bbc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -144,7 +144,7 @@ infoBean.setFileIdVerify(""); infoBean.setBzhours(""); infoBean.setBzminis(""); - //定位 + //定位点经纬度 locationMap = new HashMap<>(); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override @@ -174,20 +174,12 @@ StringBuffer buffer = new StringBuffer(); try { Address address = geoCoder.getFromLocation(latitude, longitude, 1).get(0); -// Log.d(TAG, "getLocality: " + address.getLocality()); -// Log.d(TAG, "getSubLocality: " + address.getSubLocality()); -// Log.d(TAG, "getAdminArea: " + address.getAdminArea()); -// Log.d(TAG, "getSubAdminArea: " + address.getSubAdminArea()); -// Log.d(TAG, "getThoroughfare: " + address.getThoroughfare()); -// Log.d(TAG, "getSubThoroughfare: " + address.getSubThoroughfare()); buffer.append(address.getSubLocality()) .append(address.getSubAdminArea()) .append(address.getThoroughfare()) .append(address.getSubThoroughfare()); - // infoBean.setAreaCode(address.getSubLocality()); // infoBean.setStreetCode(address.getSubAdminArea()); - //保存经纬度，供地图页面定位 locationMap.put("longitude", longitude); locationMap.put("latitude", latitude); @@ -196,11 +188,6 @@ e.printStackTrace(); } communityNameView.setText(buffer); - -// CameraPosition cameraPosition = new CameraPosition(new LatLng(latitude, longitude), 15, 0, 30); -// CameraUpdate cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition); -// aMap.moveCamera(cameraUpdate); -// drawMarkers(latitude, longitude); } } @@ -390,7 +377,7 @@ @Override public void onItemClick(AdapterView parent, View view, int position, long id) { //查看大图 - showBigImage(selectList.get(position)); + showBigImage(selectList.get(position).getRealPath()); } }); //删除按钮点击事件 @@ -445,7 +432,7 @@ } } - private void showBigImage(LocalMedia localMedia) { + private void showBigImage(String path) { } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index d3d0fa1..979deff 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -16,10 +16,13 @@ import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; +import com.casic.dcms.widgets.InputDialog; +import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; @@ -43,6 +46,8 @@ CheckBox rememberPasswordView; @BindView(R.id.autoLoginView) CheckBox autoLoginView; + @BindView(R.id.changeServerConfigButton) + QMUIAlphaImageButton changeServerConfigButton; private QMUITipDialog loadingDialog; private AuthenticatePresenterImpl authenticatePresenter; @@ -87,15 +92,42 @@ @Override public void initEvent() { loginButton.setChangeAlphaWhenPress(true); + changeServerConfigButton.setChangeAlphaWhenPress(true); authenticatePresenter = new AuthenticatePresenterImpl(this); loginPresenter = new LoginPresenterImpl(this); } - @OnClick(R.id.loginButton) + @OnClick({R.id.loginButton, R.id.changeServerConfigButton}) @Override public void onClick(View v) { - //验证公钥 - authenticatePresenter.onReadyRetrofitRequest(); + switch (v.getId()) { + case R.id.loginButton: + //验证公钥 + authenticatePresenter.onReadyRetrofitRequest(); + break; + case R.id.changeServerConfigButton: + new InputDialog.Builder() + .setContext(this) + .setTitle("修改服务器地址和端口") + .setOnDialogClickListener(new InputDialog.OnDialogClickListener() { + @Override + public void onConfirmClick(String serverValue, String portValue) { + if (!TextUtils.isEmpty(serverValue) && !TextUtils.isEmpty(portValue)) { + String serverConfig = "http:" + serverValue + ":" + portValue; + SaveKeyValues.putValue(Constant.IP_KEY, serverConfig); + ToastHelper.showToast("服务器地址修改成功", ToastHelper.SUCCESS); + } + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + break; + default: + break; + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java index f079655..29393ee 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java @@ -122,6 +122,8 @@ uiSettings.setCompassEnabled(true); uiSettings.setCompassGravity(Gravity.TOP | Gravity.END); uiSettings.setCompassMargins(0, 20, 20, 0); + uiSettings.setAttributionEnabled(false);//去掉MapBox logo旁边的按钮 + uiSettings.setLogoEnabled(false);//去掉MapBox logo LocalizationPlugin localizationPlugin = new LocalizationPlugin(mapBoxView, map, style); localizationPlugin.setMapLanguage(MapLocale.SIMPLIFIED_CHINESE); } @@ -175,13 +177,14 @@ } break; case R.id.removeToLocalView: - position = builder.zoom(zoomScale).build(); + position = builder.zoom(15).build(); break; default: break; } if (position != null) { - map.moveCamera(CameraUpdateFactory.newCameraPosition(position)); + //缓慢缩放和移动地图 + map.animateCamera(CameraUpdateFactory.newCameraPosition(position), 2000); } } diff --git a/app/build.gradle b/app/build.gradle index 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index d2958f4..9f86e54 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -35,7 +34,7 @@ @Override public Subscription sendRetrofitRequest(SubmitInfoBean infoBean) { - Observable observable = RetrofitServiceManager.submitCase(HttpConfig.BASE_IP, infoBean); + Observable observable = RetrofitServiceManager.submitCase(infoBean); 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/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index f48dbb9..cac6a2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(HttpConfig.BASE_IP, username, key); + Observable observable = RetrofitServiceManager.getTokenData(username, key); 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/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index a62efb8..e033292 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.UserBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getUserData(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.getUserData(); 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/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 9979749..7c2bbc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -144,7 +144,7 @@ infoBean.setFileIdVerify(""); infoBean.setBzhours(""); infoBean.setBzminis(""); - //定位 + //定位点经纬度 locationMap = new HashMap<>(); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override @@ -174,20 +174,12 @@ StringBuffer buffer = new StringBuffer(); try { Address address = geoCoder.getFromLocation(latitude, longitude, 1).get(0); -// Log.d(TAG, "getLocality: " + address.getLocality()); -// Log.d(TAG, "getSubLocality: " + address.getSubLocality()); -// Log.d(TAG, "getAdminArea: " + address.getAdminArea()); -// Log.d(TAG, "getSubAdminArea: " + address.getSubAdminArea()); -// Log.d(TAG, "getThoroughfare: " + address.getThoroughfare()); -// Log.d(TAG, "getSubThoroughfare: " + address.getSubThoroughfare()); buffer.append(address.getSubLocality()) .append(address.getSubAdminArea()) .append(address.getThoroughfare()) .append(address.getSubThoroughfare()); - // infoBean.setAreaCode(address.getSubLocality()); // infoBean.setStreetCode(address.getSubAdminArea()); - //保存经纬度，供地图页面定位 locationMap.put("longitude", longitude); locationMap.put("latitude", latitude); @@ -196,11 +188,6 @@ e.printStackTrace(); } communityNameView.setText(buffer); - -// CameraPosition cameraPosition = new CameraPosition(new LatLng(latitude, longitude), 15, 0, 30); -// CameraUpdate cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition); -// aMap.moveCamera(cameraUpdate); -// drawMarkers(latitude, longitude); } } @@ -390,7 +377,7 @@ @Override public void onItemClick(AdapterView parent, View view, int position, long id) { //查看大图 - showBigImage(selectList.get(position)); + showBigImage(selectList.get(position).getRealPath()); } }); //删除按钮点击事件 @@ -445,7 +432,7 @@ } } - private void showBigImage(LocalMedia localMedia) { + private void showBigImage(String path) { } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index d3d0fa1..979deff 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -16,10 +16,13 @@ import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; +import com.casic.dcms.widgets.InputDialog; +import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; @@ -43,6 +46,8 @@ CheckBox rememberPasswordView; @BindView(R.id.autoLoginView) CheckBox autoLoginView; + @BindView(R.id.changeServerConfigButton) + QMUIAlphaImageButton changeServerConfigButton; private QMUITipDialog loadingDialog; private AuthenticatePresenterImpl authenticatePresenter; @@ -87,15 +92,42 @@ @Override public void initEvent() { loginButton.setChangeAlphaWhenPress(true); + changeServerConfigButton.setChangeAlphaWhenPress(true); authenticatePresenter = new AuthenticatePresenterImpl(this); loginPresenter = new LoginPresenterImpl(this); } - @OnClick(R.id.loginButton) + @OnClick({R.id.loginButton, R.id.changeServerConfigButton}) @Override public void onClick(View v) { - //验证公钥 - authenticatePresenter.onReadyRetrofitRequest(); + switch (v.getId()) { + case R.id.loginButton: + //验证公钥 + authenticatePresenter.onReadyRetrofitRequest(); + break; + case R.id.changeServerConfigButton: + new InputDialog.Builder() + .setContext(this) + .setTitle("修改服务器地址和端口") + .setOnDialogClickListener(new InputDialog.OnDialogClickListener() { + @Override + public void onConfirmClick(String serverValue, String portValue) { + if (!TextUtils.isEmpty(serverValue) && !TextUtils.isEmpty(portValue)) { + String serverConfig = "http:" + serverValue + ":" + portValue; + SaveKeyValues.putValue(Constant.IP_KEY, serverConfig); + ToastHelper.showToast("服务器地址修改成功", ToastHelper.SUCCESS); + } + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + break; + default: + break; + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java index f079655..29393ee 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java @@ -122,6 +122,8 @@ uiSettings.setCompassEnabled(true); uiSettings.setCompassGravity(Gravity.TOP | Gravity.END); uiSettings.setCompassMargins(0, 20, 20, 0); + uiSettings.setAttributionEnabled(false);//去掉MapBox logo旁边的按钮 + uiSettings.setLogoEnabled(false);//去掉MapBox logo LocalizationPlugin localizationPlugin = new LocalizationPlugin(mapBoxView, map, style); localizationPlugin.setMapLanguage(MapLocale.SIMPLIFIED_CHINESE); } @@ -175,13 +177,14 @@ } break; case R.id.removeToLocalView: - position = builder.zoom(zoomScale).build(); + position = builder.zoom(15).build(); break; default: break; } if (position != null) { - map.moveCamera(CameraUpdateFactory.newCameraPosition(position)); + //缓慢缩放和移动地图 + map.animateCamera(CameraUpdateFactory.newCameraPosition(position), 2000); } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 49c80b7..8c90ccd 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -31,4 +31,6 @@ public static final int SELECT_PICTURE_CODE = 9001; public static final int PERMISSIONS_CODE = 999; + + public static final String IP_KEY = "BASE_IP"; } diff --git a/app/build.gradle b/app/build.gradle index 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index d2958f4..9f86e54 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -35,7 +34,7 @@ @Override public Subscription sendRetrofitRequest(SubmitInfoBean infoBean) { - Observable observable = RetrofitServiceManager.submitCase(HttpConfig.BASE_IP, infoBean); + Observable observable = RetrofitServiceManager.submitCase(infoBean); 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/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index f48dbb9..cac6a2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(HttpConfig.BASE_IP, username, key); + Observable observable = RetrofitServiceManager.getTokenData(username, key); 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/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index a62efb8..e033292 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.UserBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getUserData(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.getUserData(); 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/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 9979749..7c2bbc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -144,7 +144,7 @@ infoBean.setFileIdVerify(""); infoBean.setBzhours(""); infoBean.setBzminis(""); - //定位 + //定位点经纬度 locationMap = new HashMap<>(); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override @@ -174,20 +174,12 @@ StringBuffer buffer = new StringBuffer(); try { Address address = geoCoder.getFromLocation(latitude, longitude, 1).get(0); -// Log.d(TAG, "getLocality: " + address.getLocality()); -// Log.d(TAG, "getSubLocality: " + address.getSubLocality()); -// Log.d(TAG, "getAdminArea: " + address.getAdminArea()); -// Log.d(TAG, "getSubAdminArea: " + address.getSubAdminArea()); -// Log.d(TAG, "getThoroughfare: " + address.getThoroughfare()); -// Log.d(TAG, "getSubThoroughfare: " + address.getSubThoroughfare()); buffer.append(address.getSubLocality()) .append(address.getSubAdminArea()) .append(address.getThoroughfare()) .append(address.getSubThoroughfare()); - // infoBean.setAreaCode(address.getSubLocality()); // infoBean.setStreetCode(address.getSubAdminArea()); - //保存经纬度，供地图页面定位 locationMap.put("longitude", longitude); locationMap.put("latitude", latitude); @@ -196,11 +188,6 @@ e.printStackTrace(); } communityNameView.setText(buffer); - -// CameraPosition cameraPosition = new CameraPosition(new LatLng(latitude, longitude), 15, 0, 30); -// CameraUpdate cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition); -// aMap.moveCamera(cameraUpdate); -// drawMarkers(latitude, longitude); } } @@ -390,7 +377,7 @@ @Override public void onItemClick(AdapterView parent, View view, int position, long id) { //查看大图 - showBigImage(selectList.get(position)); + showBigImage(selectList.get(position).getRealPath()); } }); //删除按钮点击事件 @@ -445,7 +432,7 @@ } } - private void showBigImage(LocalMedia localMedia) { + private void showBigImage(String path) { } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index d3d0fa1..979deff 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -16,10 +16,13 @@ import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; +import com.casic.dcms.widgets.InputDialog; +import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; @@ -43,6 +46,8 @@ CheckBox rememberPasswordView; @BindView(R.id.autoLoginView) CheckBox autoLoginView; + @BindView(R.id.changeServerConfigButton) + QMUIAlphaImageButton changeServerConfigButton; private QMUITipDialog loadingDialog; private AuthenticatePresenterImpl authenticatePresenter; @@ -87,15 +92,42 @@ @Override public void initEvent() { loginButton.setChangeAlphaWhenPress(true); + changeServerConfigButton.setChangeAlphaWhenPress(true); authenticatePresenter = new AuthenticatePresenterImpl(this); loginPresenter = new LoginPresenterImpl(this); } - @OnClick(R.id.loginButton) + @OnClick({R.id.loginButton, R.id.changeServerConfigButton}) @Override public void onClick(View v) { - //验证公钥 - authenticatePresenter.onReadyRetrofitRequest(); + switch (v.getId()) { + case R.id.loginButton: + //验证公钥 + authenticatePresenter.onReadyRetrofitRequest(); + break; + case R.id.changeServerConfigButton: + new InputDialog.Builder() + .setContext(this) + .setTitle("修改服务器地址和端口") + .setOnDialogClickListener(new InputDialog.OnDialogClickListener() { + @Override + public void onConfirmClick(String serverValue, String portValue) { + if (!TextUtils.isEmpty(serverValue) && !TextUtils.isEmpty(portValue)) { + String serverConfig = "http:" + serverValue + ":" + portValue; + SaveKeyValues.putValue(Constant.IP_KEY, serverConfig); + ToastHelper.showToast("服务器地址修改成功", ToastHelper.SUCCESS); + } + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + break; + default: + break; + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java index f079655..29393ee 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java @@ -122,6 +122,8 @@ uiSettings.setCompassEnabled(true); uiSettings.setCompassGravity(Gravity.TOP | Gravity.END); uiSettings.setCompassMargins(0, 20, 20, 0); + uiSettings.setAttributionEnabled(false);//去掉MapBox logo旁边的按钮 + uiSettings.setLogoEnabled(false);//去掉MapBox logo LocalizationPlugin localizationPlugin = new LocalizationPlugin(mapBoxView, map, style); localizationPlugin.setMapLanguage(MapLocale.SIMPLIFIED_CHINESE); } @@ -175,13 +177,14 @@ } break; case R.id.removeToLocalView: - position = builder.zoom(zoomScale).build(); + position = builder.zoom(15).build(); break; default: break; } if (position != null) { - map.moveCamera(CameraUpdateFactory.newCameraPosition(position)); + //缓慢缩放和移动地图 + map.animateCamera(CameraUpdateFactory.newCameraPosition(position), 2000); } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 49c80b7..8c90ccd 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -31,4 +31,6 @@ public static final int SELECT_PICTURE_CODE = 9001; public static final int PERMISSIONS_CODE = 999; + + public static final String IP_KEY = "BASE_IP"; } diff --git a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java index bd3eb2e..1815327 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java @@ -1,8 +1,5 @@ package com.casic.dcms.utils; public class HttpConfig { - public static final String BASE_IP = "http://111.198.10.15:11409"; public static final long HTTP_TIMEOUT = 30L; - public static final String HTTP_TOKEN_KET = ""; - public static final int REQUEST_TOKEN_INVALID = 0; } diff --git a/app/build.gradle b/app/build.gradle index 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index d2958f4..9f86e54 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -35,7 +34,7 @@ @Override public Subscription sendRetrofitRequest(SubmitInfoBean infoBean) { - Observable observable = RetrofitServiceManager.submitCase(HttpConfig.BASE_IP, infoBean); + Observable observable = RetrofitServiceManager.submitCase(infoBean); 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/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index f48dbb9..cac6a2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(HttpConfig.BASE_IP, username, key); + Observable observable = RetrofitServiceManager.getTokenData(username, key); 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/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index a62efb8..e033292 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.UserBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getUserData(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.getUserData(); 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/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 9979749..7c2bbc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -144,7 +144,7 @@ infoBean.setFileIdVerify(""); infoBean.setBzhours(""); infoBean.setBzminis(""); - //定位 + //定位点经纬度 locationMap = new HashMap<>(); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override @@ -174,20 +174,12 @@ StringBuffer buffer = new StringBuffer(); try { Address address = geoCoder.getFromLocation(latitude, longitude, 1).get(0); -// Log.d(TAG, "getLocality: " + address.getLocality()); -// Log.d(TAG, "getSubLocality: " + address.getSubLocality()); -// Log.d(TAG, "getAdminArea: " + address.getAdminArea()); -// Log.d(TAG, "getSubAdminArea: " + address.getSubAdminArea()); -// Log.d(TAG, "getThoroughfare: " + address.getThoroughfare()); -// Log.d(TAG, "getSubThoroughfare: " + address.getSubThoroughfare()); buffer.append(address.getSubLocality()) .append(address.getSubAdminArea()) .append(address.getThoroughfare()) .append(address.getSubThoroughfare()); - // infoBean.setAreaCode(address.getSubLocality()); // infoBean.setStreetCode(address.getSubAdminArea()); - //保存经纬度，供地图页面定位 locationMap.put("longitude", longitude); locationMap.put("latitude", latitude); @@ -196,11 +188,6 @@ e.printStackTrace(); } communityNameView.setText(buffer); - -// CameraPosition cameraPosition = new CameraPosition(new LatLng(latitude, longitude), 15, 0, 30); -// CameraUpdate cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition); -// aMap.moveCamera(cameraUpdate); -// drawMarkers(latitude, longitude); } } @@ -390,7 +377,7 @@ @Override public void onItemClick(AdapterView parent, View view, int position, long id) { //查看大图 - showBigImage(selectList.get(position)); + showBigImage(selectList.get(position).getRealPath()); } }); //删除按钮点击事件 @@ -445,7 +432,7 @@ } } - private void showBigImage(LocalMedia localMedia) { + private void showBigImage(String path) { } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index d3d0fa1..979deff 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -16,10 +16,13 @@ import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; +import com.casic.dcms.widgets.InputDialog; +import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; @@ -43,6 +46,8 @@ CheckBox rememberPasswordView; @BindView(R.id.autoLoginView) CheckBox autoLoginView; + @BindView(R.id.changeServerConfigButton) + QMUIAlphaImageButton changeServerConfigButton; private QMUITipDialog loadingDialog; private AuthenticatePresenterImpl authenticatePresenter; @@ -87,15 +92,42 @@ @Override public void initEvent() { loginButton.setChangeAlphaWhenPress(true); + changeServerConfigButton.setChangeAlphaWhenPress(true); authenticatePresenter = new AuthenticatePresenterImpl(this); loginPresenter = new LoginPresenterImpl(this); } - @OnClick(R.id.loginButton) + @OnClick({R.id.loginButton, R.id.changeServerConfigButton}) @Override public void onClick(View v) { - //验证公钥 - authenticatePresenter.onReadyRetrofitRequest(); + switch (v.getId()) { + case R.id.loginButton: + //验证公钥 + authenticatePresenter.onReadyRetrofitRequest(); + break; + case R.id.changeServerConfigButton: + new InputDialog.Builder() + .setContext(this) + .setTitle("修改服务器地址和端口") + .setOnDialogClickListener(new InputDialog.OnDialogClickListener() { + @Override + public void onConfirmClick(String serverValue, String portValue) { + if (!TextUtils.isEmpty(serverValue) && !TextUtils.isEmpty(portValue)) { + String serverConfig = "http:" + serverValue + ":" + portValue; + SaveKeyValues.putValue(Constant.IP_KEY, serverConfig); + ToastHelper.showToast("服务器地址修改成功", ToastHelper.SUCCESS); + } + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + break; + default: + break; + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java index f079655..29393ee 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java @@ -122,6 +122,8 @@ uiSettings.setCompassEnabled(true); uiSettings.setCompassGravity(Gravity.TOP | Gravity.END); uiSettings.setCompassMargins(0, 20, 20, 0); + uiSettings.setAttributionEnabled(false);//去掉MapBox logo旁边的按钮 + uiSettings.setLogoEnabled(false);//去掉MapBox logo LocalizationPlugin localizationPlugin = new LocalizationPlugin(mapBoxView, map, style); localizationPlugin.setMapLanguage(MapLocale.SIMPLIFIED_CHINESE); } @@ -175,13 +177,14 @@ } break; case R.id.removeToLocalView: - position = builder.zoom(zoomScale).build(); + position = builder.zoom(15).build(); break; default: break; } if (position != null) { - map.moveCamera(CameraUpdateFactory.newCameraPosition(position)); + //缓慢缩放和移动地图 + map.animateCamera(CameraUpdateFactory.newCameraPosition(position), 2000); } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 49c80b7..8c90ccd 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -31,4 +31,6 @@ public static final int SELECT_PICTURE_CODE = 9001; public static final int PERMISSIONS_CODE = 999; + + public static final String IP_KEY = "BASE_IP"; } diff --git a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java index bd3eb2e..1815327 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java @@ -1,8 +1,5 @@ package com.casic.dcms.utils; public class HttpConfig { - public static final String BASE_IP = "http://111.198.10.15:11409"; public static final long HTTP_TIMEOUT = 30L; - public static final String HTTP_TOKEN_KET = ""; - public static final int REQUEST_TOKEN_INVALID = 0; } 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 9769a94..b557907 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 @@ -9,7 +9,9 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; import com.casic.dcms.bean.UserBean; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.HttpConfig; +import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.TokenHelper; import org.jetbrains.annotations.NotNull; @@ -26,9 +28,10 @@ public class RetrofitServiceManager { private static final String TAG = "RetrofitServiceManager"; - private static Retrofit createRetrofit(String baseUrl) { + private static Retrofit createRetrofit() { + String ip = (String) SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409"); return new Retrofit.Builder() - .baseUrl(baseUrl) + .baseUrl(ip) .addConverterFactory(GsonConverterFactory.create())//Gson转换器 .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) .client(createOKHttpClient())//log拦截器 @@ -54,8 +57,8 @@ /** * 验证PublicKey */ - public static Observable authenticate(String baseUrl) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable authenticate() { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getPublicKey(); } @@ -63,8 +66,8 @@ /** * 登录并获取Token */ - public static Observable getTokenData(String baseUrl, String username, String key) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getTokenData(String username, String key) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.login(username, key); } @@ -72,8 +75,8 @@ /** * 获取用户信息 */ - public static Observable getUserData(String baseUrl) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getUserData() { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getUser(TokenHelper.getToken()); } @@ -81,8 +84,8 @@ /** * 大类列表查询 */ - public static Observable getCaseLargeClass(String baseUrl, String eorc) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getCaseLargeClass(String eorc) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getLargeClass(TokenHelper.getToken(), eorc); } @@ -90,8 +93,8 @@ /** * 大类列表查询 */ - public static Observable getCaseSmallClass(String baseUrl, String eorc, String typeId) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getCaseSmallClass(String eorc, String typeId) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getLargeClass(TokenHelper.getToken(), eorc, typeId); } @@ -99,8 +102,8 @@ /** * 提交案卷 */ - public static Observable submitCase(String baseUrl, SubmitInfoBean infoBean) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable submitCase(SubmitInfoBean infoBean) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.submit(TokenHelper.getToken(), infoBean); } diff --git a/app/build.gradle b/app/build.gradle index 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index d2958f4..9f86e54 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -35,7 +34,7 @@ @Override public Subscription sendRetrofitRequest(SubmitInfoBean infoBean) { - Observable observable = RetrofitServiceManager.submitCase(HttpConfig.BASE_IP, infoBean); + Observable observable = RetrofitServiceManager.submitCase(infoBean); 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/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index f48dbb9..cac6a2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(HttpConfig.BASE_IP, username, key); + Observable observable = RetrofitServiceManager.getTokenData(username, key); 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/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index a62efb8..e033292 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.UserBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getUserData(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.getUserData(); 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/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 9979749..7c2bbc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -144,7 +144,7 @@ infoBean.setFileIdVerify(""); infoBean.setBzhours(""); infoBean.setBzminis(""); - //定位 + //定位点经纬度 locationMap = new HashMap<>(); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override @@ -174,20 +174,12 @@ StringBuffer buffer = new StringBuffer(); try { Address address = geoCoder.getFromLocation(latitude, longitude, 1).get(0); -// Log.d(TAG, "getLocality: " + address.getLocality()); -// Log.d(TAG, "getSubLocality: " + address.getSubLocality()); -// Log.d(TAG, "getAdminArea: " + address.getAdminArea()); -// Log.d(TAG, "getSubAdminArea: " + address.getSubAdminArea()); -// Log.d(TAG, "getThoroughfare: " + address.getThoroughfare()); -// Log.d(TAG, "getSubThoroughfare: " + address.getSubThoroughfare()); buffer.append(address.getSubLocality()) .append(address.getSubAdminArea()) .append(address.getThoroughfare()) .append(address.getSubThoroughfare()); - // infoBean.setAreaCode(address.getSubLocality()); // infoBean.setStreetCode(address.getSubAdminArea()); - //保存经纬度，供地图页面定位 locationMap.put("longitude", longitude); locationMap.put("latitude", latitude); @@ -196,11 +188,6 @@ e.printStackTrace(); } communityNameView.setText(buffer); - -// CameraPosition cameraPosition = new CameraPosition(new LatLng(latitude, longitude), 15, 0, 30); -// CameraUpdate cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition); -// aMap.moveCamera(cameraUpdate); -// drawMarkers(latitude, longitude); } } @@ -390,7 +377,7 @@ @Override public void onItemClick(AdapterView parent, View view, int position, long id) { //查看大图 - showBigImage(selectList.get(position)); + showBigImage(selectList.get(position).getRealPath()); } }); //删除按钮点击事件 @@ -445,7 +432,7 @@ } } - private void showBigImage(LocalMedia localMedia) { + private void showBigImage(String path) { } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index d3d0fa1..979deff 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -16,10 +16,13 @@ import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; +import com.casic.dcms.widgets.InputDialog; +import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; @@ -43,6 +46,8 @@ CheckBox rememberPasswordView; @BindView(R.id.autoLoginView) CheckBox autoLoginView; + @BindView(R.id.changeServerConfigButton) + QMUIAlphaImageButton changeServerConfigButton; private QMUITipDialog loadingDialog; private AuthenticatePresenterImpl authenticatePresenter; @@ -87,15 +92,42 @@ @Override public void initEvent() { loginButton.setChangeAlphaWhenPress(true); + changeServerConfigButton.setChangeAlphaWhenPress(true); authenticatePresenter = new AuthenticatePresenterImpl(this); loginPresenter = new LoginPresenterImpl(this); } - @OnClick(R.id.loginButton) + @OnClick({R.id.loginButton, R.id.changeServerConfigButton}) @Override public void onClick(View v) { - //验证公钥 - authenticatePresenter.onReadyRetrofitRequest(); + switch (v.getId()) { + case R.id.loginButton: + //验证公钥 + authenticatePresenter.onReadyRetrofitRequest(); + break; + case R.id.changeServerConfigButton: + new InputDialog.Builder() + .setContext(this) + .setTitle("修改服务器地址和端口") + .setOnDialogClickListener(new InputDialog.OnDialogClickListener() { + @Override + public void onConfirmClick(String serverValue, String portValue) { + if (!TextUtils.isEmpty(serverValue) && !TextUtils.isEmpty(portValue)) { + String serverConfig = "http:" + serverValue + ":" + portValue; + SaveKeyValues.putValue(Constant.IP_KEY, serverConfig); + ToastHelper.showToast("服务器地址修改成功", ToastHelper.SUCCESS); + } + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + break; + default: + break; + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java index f079655..29393ee 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java @@ -122,6 +122,8 @@ uiSettings.setCompassEnabled(true); uiSettings.setCompassGravity(Gravity.TOP | Gravity.END); uiSettings.setCompassMargins(0, 20, 20, 0); + uiSettings.setAttributionEnabled(false);//去掉MapBox logo旁边的按钮 + uiSettings.setLogoEnabled(false);//去掉MapBox logo LocalizationPlugin localizationPlugin = new LocalizationPlugin(mapBoxView, map, style); localizationPlugin.setMapLanguage(MapLocale.SIMPLIFIED_CHINESE); } @@ -175,13 +177,14 @@ } break; case R.id.removeToLocalView: - position = builder.zoom(zoomScale).build(); + position = builder.zoom(15).build(); break; default: break; } if (position != null) { - map.moveCamera(CameraUpdateFactory.newCameraPosition(position)); + //缓慢缩放和移动地图 + map.animateCamera(CameraUpdateFactory.newCameraPosition(position), 2000); } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 49c80b7..8c90ccd 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -31,4 +31,6 @@ public static final int SELECT_PICTURE_CODE = 9001; public static final int PERMISSIONS_CODE = 999; + + public static final String IP_KEY = "BASE_IP"; } diff --git a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java index bd3eb2e..1815327 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java @@ -1,8 +1,5 @@ package com.casic.dcms.utils; public class HttpConfig { - public static final String BASE_IP = "http://111.198.10.15:11409"; public static final long HTTP_TIMEOUT = 30L; - public static final String HTTP_TOKEN_KET = ""; - public static final int REQUEST_TOKEN_INVALID = 0; } 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 9769a94..b557907 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 @@ -9,7 +9,9 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; import com.casic.dcms.bean.UserBean; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.HttpConfig; +import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.TokenHelper; import org.jetbrains.annotations.NotNull; @@ -26,9 +28,10 @@ public class RetrofitServiceManager { private static final String TAG = "RetrofitServiceManager"; - private static Retrofit createRetrofit(String baseUrl) { + private static Retrofit createRetrofit() { + String ip = (String) SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409"); return new Retrofit.Builder() - .baseUrl(baseUrl) + .baseUrl(ip) .addConverterFactory(GsonConverterFactory.create())//Gson转换器 .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) .client(createOKHttpClient())//log拦截器 @@ -54,8 +57,8 @@ /** * 验证PublicKey */ - public static Observable authenticate(String baseUrl) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable authenticate() { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getPublicKey(); } @@ -63,8 +66,8 @@ /** * 登录并获取Token */ - public static Observable getTokenData(String baseUrl, String username, String key) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getTokenData(String username, String key) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.login(username, key); } @@ -72,8 +75,8 @@ /** * 获取用户信息 */ - public static Observable getUserData(String baseUrl) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getUserData() { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getUser(TokenHelper.getToken()); } @@ -81,8 +84,8 @@ /** * 大类列表查询 */ - public static Observable getCaseLargeClass(String baseUrl, String eorc) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getCaseLargeClass(String eorc) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getLargeClass(TokenHelper.getToken(), eorc); } @@ -90,8 +93,8 @@ /** * 大类列表查询 */ - public static Observable getCaseSmallClass(String baseUrl, String eorc, String typeId) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getCaseSmallClass(String eorc, String typeId) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getLargeClass(TokenHelper.getToken(), eorc, typeId); } @@ -99,8 +102,8 @@ /** * 提交案卷 */ - public static Observable submitCase(String baseUrl, SubmitInfoBean infoBean) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable submitCase(SubmitInfoBean infoBean) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.submit(TokenHelper.getToken(), infoBean); } diff --git a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java new file mode 100644 index 0000000..2a358c0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java @@ -0,0 +1,41 @@ +package com.casic.dcms.widgets; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +/** + * @author : Pengxh + * @time : 2021/4/13 16:32 + * @email : 290677893@qq.com + **/ +public class BigPictureDialog extends DialogFragment { + + private static final String TAG = "BigPictureDialog"; + private View mRootView; + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + //对话框的布局 + if (mRootView == null) { + mRootView = inflater.inflate(R.layout.dialog_big_picture, container, false); + } + Bundle bundle = getArguments(); + if (bundle != null) { + String path = bundle.getString("path"); + QMUIRadiusImageView radiusImageView = mRootView.findViewById(R.id.bigPictureView); + Glide.with(this).load(path).into(radiusImageView); + } + return mRootView; + } +} diff --git a/app/build.gradle b/app/build.gradle index 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index d2958f4..9f86e54 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -35,7 +34,7 @@ @Override public Subscription sendRetrofitRequest(SubmitInfoBean infoBean) { - Observable observable = RetrofitServiceManager.submitCase(HttpConfig.BASE_IP, infoBean); + Observable observable = RetrofitServiceManager.submitCase(infoBean); 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/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index f48dbb9..cac6a2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(HttpConfig.BASE_IP, username, key); + Observable observable = RetrofitServiceManager.getTokenData(username, key); 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/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index a62efb8..e033292 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.UserBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getUserData(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.getUserData(); 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/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 9979749..7c2bbc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -144,7 +144,7 @@ infoBean.setFileIdVerify(""); infoBean.setBzhours(""); infoBean.setBzminis(""); - //定位 + //定位点经纬度 locationMap = new HashMap<>(); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override @@ -174,20 +174,12 @@ StringBuffer buffer = new StringBuffer(); try { Address address = geoCoder.getFromLocation(latitude, longitude, 1).get(0); -// Log.d(TAG, "getLocality: " + address.getLocality()); -// Log.d(TAG, "getSubLocality: " + address.getSubLocality()); -// Log.d(TAG, "getAdminArea: " + address.getAdminArea()); -// Log.d(TAG, "getSubAdminArea: " + address.getSubAdminArea()); -// Log.d(TAG, "getThoroughfare: " + address.getThoroughfare()); -// Log.d(TAG, "getSubThoroughfare: " + address.getSubThoroughfare()); buffer.append(address.getSubLocality()) .append(address.getSubAdminArea()) .append(address.getThoroughfare()) .append(address.getSubThoroughfare()); - // infoBean.setAreaCode(address.getSubLocality()); // infoBean.setStreetCode(address.getSubAdminArea()); - //保存经纬度，供地图页面定位 locationMap.put("longitude", longitude); locationMap.put("latitude", latitude); @@ -196,11 +188,6 @@ e.printStackTrace(); } communityNameView.setText(buffer); - -// CameraPosition cameraPosition = new CameraPosition(new LatLng(latitude, longitude), 15, 0, 30); -// CameraUpdate cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition); -// aMap.moveCamera(cameraUpdate); -// drawMarkers(latitude, longitude); } } @@ -390,7 +377,7 @@ @Override public void onItemClick(AdapterView parent, View view, int position, long id) { //查看大图 - showBigImage(selectList.get(position)); + showBigImage(selectList.get(position).getRealPath()); } }); //删除按钮点击事件 @@ -445,7 +432,7 @@ } } - private void showBigImage(LocalMedia localMedia) { + private void showBigImage(String path) { } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index d3d0fa1..979deff 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -16,10 +16,13 @@ import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; +import com.casic.dcms.widgets.InputDialog; +import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; @@ -43,6 +46,8 @@ CheckBox rememberPasswordView; @BindView(R.id.autoLoginView) CheckBox autoLoginView; + @BindView(R.id.changeServerConfigButton) + QMUIAlphaImageButton changeServerConfigButton; private QMUITipDialog loadingDialog; private AuthenticatePresenterImpl authenticatePresenter; @@ -87,15 +92,42 @@ @Override public void initEvent() { loginButton.setChangeAlphaWhenPress(true); + changeServerConfigButton.setChangeAlphaWhenPress(true); authenticatePresenter = new AuthenticatePresenterImpl(this); loginPresenter = new LoginPresenterImpl(this); } - @OnClick(R.id.loginButton) + @OnClick({R.id.loginButton, R.id.changeServerConfigButton}) @Override public void onClick(View v) { - //验证公钥 - authenticatePresenter.onReadyRetrofitRequest(); + switch (v.getId()) { + case R.id.loginButton: + //验证公钥 + authenticatePresenter.onReadyRetrofitRequest(); + break; + case R.id.changeServerConfigButton: + new InputDialog.Builder() + .setContext(this) + .setTitle("修改服务器地址和端口") + .setOnDialogClickListener(new InputDialog.OnDialogClickListener() { + @Override + public void onConfirmClick(String serverValue, String portValue) { + if (!TextUtils.isEmpty(serverValue) && !TextUtils.isEmpty(portValue)) { + String serverConfig = "http:" + serverValue + ":" + portValue; + SaveKeyValues.putValue(Constant.IP_KEY, serverConfig); + ToastHelper.showToast("服务器地址修改成功", ToastHelper.SUCCESS); + } + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + break; + default: + break; + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java index f079655..29393ee 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java @@ -122,6 +122,8 @@ uiSettings.setCompassEnabled(true); uiSettings.setCompassGravity(Gravity.TOP | Gravity.END); uiSettings.setCompassMargins(0, 20, 20, 0); + uiSettings.setAttributionEnabled(false);//去掉MapBox logo旁边的按钮 + uiSettings.setLogoEnabled(false);//去掉MapBox logo LocalizationPlugin localizationPlugin = new LocalizationPlugin(mapBoxView, map, style); localizationPlugin.setMapLanguage(MapLocale.SIMPLIFIED_CHINESE); } @@ -175,13 +177,14 @@ } break; case R.id.removeToLocalView: - position = builder.zoom(zoomScale).build(); + position = builder.zoom(15).build(); break; default: break; } if (position != null) { - map.moveCamera(CameraUpdateFactory.newCameraPosition(position)); + //缓慢缩放和移动地图 + map.animateCamera(CameraUpdateFactory.newCameraPosition(position), 2000); } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 49c80b7..8c90ccd 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -31,4 +31,6 @@ public static final int SELECT_PICTURE_CODE = 9001; public static final int PERMISSIONS_CODE = 999; + + public static final String IP_KEY = "BASE_IP"; } diff --git a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java index bd3eb2e..1815327 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java @@ -1,8 +1,5 @@ package com.casic.dcms.utils; public class HttpConfig { - public static final String BASE_IP = "http://111.198.10.15:11409"; public static final long HTTP_TIMEOUT = 30L; - public static final String HTTP_TOKEN_KET = ""; - public static final int REQUEST_TOKEN_INVALID = 0; } 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 9769a94..b557907 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 @@ -9,7 +9,9 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; import com.casic.dcms.bean.UserBean; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.HttpConfig; +import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.TokenHelper; import org.jetbrains.annotations.NotNull; @@ -26,9 +28,10 @@ public class RetrofitServiceManager { private static final String TAG = "RetrofitServiceManager"; - private static Retrofit createRetrofit(String baseUrl) { + private static Retrofit createRetrofit() { + String ip = (String) SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409"); return new Retrofit.Builder() - .baseUrl(baseUrl) + .baseUrl(ip) .addConverterFactory(GsonConverterFactory.create())//Gson转换器 .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) .client(createOKHttpClient())//log拦截器 @@ -54,8 +57,8 @@ /** * 验证PublicKey */ - public static Observable authenticate(String baseUrl) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable authenticate() { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getPublicKey(); } @@ -63,8 +66,8 @@ /** * 登录并获取Token */ - public static Observable getTokenData(String baseUrl, String username, String key) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getTokenData(String username, String key) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.login(username, key); } @@ -72,8 +75,8 @@ /** * 获取用户信息 */ - public static Observable getUserData(String baseUrl) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getUserData() { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getUser(TokenHelper.getToken()); } @@ -81,8 +84,8 @@ /** * 大类列表查询 */ - public static Observable getCaseLargeClass(String baseUrl, String eorc) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getCaseLargeClass(String eorc) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getLargeClass(TokenHelper.getToken(), eorc); } @@ -90,8 +93,8 @@ /** * 大类列表查询 */ - public static Observable getCaseSmallClass(String baseUrl, String eorc, String typeId) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getCaseSmallClass(String eorc, String typeId) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getLargeClass(TokenHelper.getToken(), eorc, typeId); } @@ -99,8 +102,8 @@ /** * 提交案卷 */ - public static Observable submitCase(String baseUrl, SubmitInfoBean infoBean) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable submitCase(SubmitInfoBean infoBean) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.submit(TokenHelper.getToken(), infoBean); } diff --git a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java new file mode 100644 index 0000000..2a358c0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java @@ -0,0 +1,41 @@ +package com.casic.dcms.widgets; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +/** + * @author : Pengxh + * @time : 2021/4/13 16:32 + * @email : 290677893@qq.com + **/ +public class BigPictureDialog extends DialogFragment { + + private static final String TAG = "BigPictureDialog"; + private View mRootView; + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + //对话框的布局 + if (mRootView == null) { + mRootView = inflater.inflate(R.layout.dialog_big_picture, container, false); + } + Bundle bundle = getArguments(); + if (bundle != null) { + String path = bundle.getString("path"); + QMUIRadiusImageView radiusImageView = mRootView.findViewById(R.id.bigPictureView); + Glide.with(this).load(path).into(radiusImageView); + } + return mRootView; + } +} diff --git a/app/src/main/java/com/casic/dcms/widgets/InputDialog.java b/app/src/main/java/com/casic/dcms/widgets/InputDialog.java new file mode 100644 index 0000000..36def9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/widgets/InputDialog.java @@ -0,0 +1,104 @@ +package com.casic.dcms.widgets; + +import android.app.Dialog; +import android.content.Context; +import android.os.Bundle; +import android.text.TextUtils; +import android.view.View; +import android.widget.EditText; +import android.widget.TextView; + +import com.casic.dcms.R; +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; + +/** + * @Author: Pengxh + * @Time: 2021/4/13 13:18 + * @Email: 290677893@qq.com + **/ +public class InputDialog extends Dialog implements View.OnClickListener { + + private static final String TAG = "InputDialog"; + private String title; + private OnDialogClickListener listener; + private EditText serverView; + private EditText portView; + + private InputDialog(Builder builder) { + super(builder.mContext); + this.title = builder.title; + this.listener = builder.listener; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.dialog_input); + initView(); + } + + private void initView() { + TextView dialogTitle = findViewById(R.id.dialogTitle); + serverView = findViewById(R.id.inputServerView); + portView = findViewById(R.id.inputPortView); + QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); + dialogCancelButton.setChangeAlphaWhenPress(true); + dialogCancelButton.setOnClickListener(this); + + QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); + dialogConfirmButton.setChangeAlphaWhenPress(true); + dialogConfirmButton.setOnClickListener(this); + + if (!TextUtils.isEmpty(title)) { + dialogTitle.setText(title); + } + } + + @Override + public void onClick(View view) { + int i = view.getId(); + if (i == R.id.dialogCancelButton) { + if (listener != null) { + listener.onCancelClick(); + } + } else if (i == R.id.dialogConfirmButton) { + if (listener != null) { + String server = serverView.getText().toString().trim(); + String port = portView.getText().toString().trim(); + listener.onConfirmClick(server, port); + } + } + this.dismiss(); + } + + public static class Builder { + private Context mContext; + private String title; + private OnDialogClickListener listener; + + public Builder setContext(Context context) { + this.mContext = context; + return this; + } + + public Builder setTitle(String title) { + this.title = title; + return this; + } + + public Builder setOnDialogClickListener(OnDialogClickListener listener) { + this.listener = listener; + return this; + } + + public InputDialog build() { + return new InputDialog(this); + } + } + + public interface OnDialogClickListener { + void onConfirmClick(String serverValue, String portValue); + + void onCancelClick(); + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index d2958f4..9f86e54 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -35,7 +34,7 @@ @Override public Subscription sendRetrofitRequest(SubmitInfoBean infoBean) { - Observable observable = RetrofitServiceManager.submitCase(HttpConfig.BASE_IP, infoBean); + Observable observable = RetrofitServiceManager.submitCase(infoBean); 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/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index f48dbb9..cac6a2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(HttpConfig.BASE_IP, username, key); + Observable observable = RetrofitServiceManager.getTokenData(username, key); 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/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index a62efb8..e033292 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.UserBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getUserData(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.getUserData(); 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/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 9979749..7c2bbc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -144,7 +144,7 @@ infoBean.setFileIdVerify(""); infoBean.setBzhours(""); infoBean.setBzminis(""); - //定位 + //定位点经纬度 locationMap = new HashMap<>(); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override @@ -174,20 +174,12 @@ StringBuffer buffer = new StringBuffer(); try { Address address = geoCoder.getFromLocation(latitude, longitude, 1).get(0); -// Log.d(TAG, "getLocality: " + address.getLocality()); -// Log.d(TAG, "getSubLocality: " + address.getSubLocality()); -// Log.d(TAG, "getAdminArea: " + address.getAdminArea()); -// Log.d(TAG, "getSubAdminArea: " + address.getSubAdminArea()); -// Log.d(TAG, "getThoroughfare: " + address.getThoroughfare()); -// Log.d(TAG, "getSubThoroughfare: " + address.getSubThoroughfare()); buffer.append(address.getSubLocality()) .append(address.getSubAdminArea()) .append(address.getThoroughfare()) .append(address.getSubThoroughfare()); - // infoBean.setAreaCode(address.getSubLocality()); // infoBean.setStreetCode(address.getSubAdminArea()); - //保存经纬度，供地图页面定位 locationMap.put("longitude", longitude); locationMap.put("latitude", latitude); @@ -196,11 +188,6 @@ e.printStackTrace(); } communityNameView.setText(buffer); - -// CameraPosition cameraPosition = new CameraPosition(new LatLng(latitude, longitude), 15, 0, 30); -// CameraUpdate cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition); -// aMap.moveCamera(cameraUpdate); -// drawMarkers(latitude, longitude); } } @@ -390,7 +377,7 @@ @Override public void onItemClick(AdapterView parent, View view, int position, long id) { //查看大图 - showBigImage(selectList.get(position)); + showBigImage(selectList.get(position).getRealPath()); } }); //删除按钮点击事件 @@ -445,7 +432,7 @@ } } - private void showBigImage(LocalMedia localMedia) { + private void showBigImage(String path) { } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index d3d0fa1..979deff 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -16,10 +16,13 @@ import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; +import com.casic.dcms.widgets.InputDialog; +import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; @@ -43,6 +46,8 @@ CheckBox rememberPasswordView; @BindView(R.id.autoLoginView) CheckBox autoLoginView; + @BindView(R.id.changeServerConfigButton) + QMUIAlphaImageButton changeServerConfigButton; private QMUITipDialog loadingDialog; private AuthenticatePresenterImpl authenticatePresenter; @@ -87,15 +92,42 @@ @Override public void initEvent() { loginButton.setChangeAlphaWhenPress(true); + changeServerConfigButton.setChangeAlphaWhenPress(true); authenticatePresenter = new AuthenticatePresenterImpl(this); loginPresenter = new LoginPresenterImpl(this); } - @OnClick(R.id.loginButton) + @OnClick({R.id.loginButton, R.id.changeServerConfigButton}) @Override public void onClick(View v) { - //验证公钥 - authenticatePresenter.onReadyRetrofitRequest(); + switch (v.getId()) { + case R.id.loginButton: + //验证公钥 + authenticatePresenter.onReadyRetrofitRequest(); + break; + case R.id.changeServerConfigButton: + new InputDialog.Builder() + .setContext(this) + .setTitle("修改服务器地址和端口") + .setOnDialogClickListener(new InputDialog.OnDialogClickListener() { + @Override + public void onConfirmClick(String serverValue, String portValue) { + if (!TextUtils.isEmpty(serverValue) && !TextUtils.isEmpty(portValue)) { + String serverConfig = "http:" + serverValue + ":" + portValue; + SaveKeyValues.putValue(Constant.IP_KEY, serverConfig); + ToastHelper.showToast("服务器地址修改成功", ToastHelper.SUCCESS); + } + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + break; + default: + break; + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java index f079655..29393ee 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java @@ -122,6 +122,8 @@ uiSettings.setCompassEnabled(true); uiSettings.setCompassGravity(Gravity.TOP | Gravity.END); uiSettings.setCompassMargins(0, 20, 20, 0); + uiSettings.setAttributionEnabled(false);//去掉MapBox logo旁边的按钮 + uiSettings.setLogoEnabled(false);//去掉MapBox logo LocalizationPlugin localizationPlugin = new LocalizationPlugin(mapBoxView, map, style); localizationPlugin.setMapLanguage(MapLocale.SIMPLIFIED_CHINESE); } @@ -175,13 +177,14 @@ } break; case R.id.removeToLocalView: - position = builder.zoom(zoomScale).build(); + position = builder.zoom(15).build(); break; default: break; } if (position != null) { - map.moveCamera(CameraUpdateFactory.newCameraPosition(position)); + //缓慢缩放和移动地图 + map.animateCamera(CameraUpdateFactory.newCameraPosition(position), 2000); } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 49c80b7..8c90ccd 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -31,4 +31,6 @@ public static final int SELECT_PICTURE_CODE = 9001; public static final int PERMISSIONS_CODE = 999; + + public static final String IP_KEY = "BASE_IP"; } diff --git a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java index bd3eb2e..1815327 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java @@ -1,8 +1,5 @@ package com.casic.dcms.utils; public class HttpConfig { - public static final String BASE_IP = "http://111.198.10.15:11409"; public static final long HTTP_TIMEOUT = 30L; - public static final String HTTP_TOKEN_KET = ""; - public static final int REQUEST_TOKEN_INVALID = 0; } 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 9769a94..b557907 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 @@ -9,7 +9,9 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; import com.casic.dcms.bean.UserBean; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.HttpConfig; +import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.TokenHelper; import org.jetbrains.annotations.NotNull; @@ -26,9 +28,10 @@ public class RetrofitServiceManager { private static final String TAG = "RetrofitServiceManager"; - private static Retrofit createRetrofit(String baseUrl) { + private static Retrofit createRetrofit() { + String ip = (String) SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409"); return new Retrofit.Builder() - .baseUrl(baseUrl) + .baseUrl(ip) .addConverterFactory(GsonConverterFactory.create())//Gson转换器 .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) .client(createOKHttpClient())//log拦截器 @@ -54,8 +57,8 @@ /** * 验证PublicKey */ - public static Observable authenticate(String baseUrl) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable authenticate() { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getPublicKey(); } @@ -63,8 +66,8 @@ /** * 登录并获取Token */ - public static Observable getTokenData(String baseUrl, String username, String key) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getTokenData(String username, String key) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.login(username, key); } @@ -72,8 +75,8 @@ /** * 获取用户信息 */ - public static Observable getUserData(String baseUrl) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getUserData() { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getUser(TokenHelper.getToken()); } @@ -81,8 +84,8 @@ /** * 大类列表查询 */ - public static Observable getCaseLargeClass(String baseUrl, String eorc) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getCaseLargeClass(String eorc) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getLargeClass(TokenHelper.getToken(), eorc); } @@ -90,8 +93,8 @@ /** * 大类列表查询 */ - public static Observable getCaseSmallClass(String baseUrl, String eorc, String typeId) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getCaseSmallClass(String eorc, String typeId) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getLargeClass(TokenHelper.getToken(), eorc, typeId); } @@ -99,8 +102,8 @@ /** * 提交案卷 */ - public static Observable submitCase(String baseUrl, SubmitInfoBean infoBean) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable submitCase(SubmitInfoBean infoBean) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.submit(TokenHelper.getToken(), infoBean); } diff --git a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java new file mode 100644 index 0000000..2a358c0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java @@ -0,0 +1,41 @@ +package com.casic.dcms.widgets; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +/** + * @author : Pengxh + * @time : 2021/4/13 16:32 + * @email : 290677893@qq.com + **/ +public class BigPictureDialog extends DialogFragment { + + private static final String TAG = "BigPictureDialog"; + private View mRootView; + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + //对话框的布局 + if (mRootView == null) { + mRootView = inflater.inflate(R.layout.dialog_big_picture, container, false); + } + Bundle bundle = getArguments(); + if (bundle != null) { + String path = bundle.getString("path"); + QMUIRadiusImageView radiusImageView = mRootView.findViewById(R.id.bigPictureView); + Glide.with(this).load(path).into(radiusImageView); + } + return mRootView; + } +} diff --git a/app/src/main/java/com/casic/dcms/widgets/InputDialog.java b/app/src/main/java/com/casic/dcms/widgets/InputDialog.java new file mode 100644 index 0000000..36def9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/widgets/InputDialog.java @@ -0,0 +1,104 @@ +package com.casic.dcms.widgets; + +import android.app.Dialog; +import android.content.Context; +import android.os.Bundle; +import android.text.TextUtils; +import android.view.View; +import android.widget.EditText; +import android.widget.TextView; + +import com.casic.dcms.R; +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; + +/** + * @Author: Pengxh + * @Time: 2021/4/13 13:18 + * @Email: 290677893@qq.com + **/ +public class InputDialog extends Dialog implements View.OnClickListener { + + private static final String TAG = "InputDialog"; + private String title; + private OnDialogClickListener listener; + private EditText serverView; + private EditText portView; + + private InputDialog(Builder builder) { + super(builder.mContext); + this.title = builder.title; + this.listener = builder.listener; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.dialog_input); + initView(); + } + + private void initView() { + TextView dialogTitle = findViewById(R.id.dialogTitle); + serverView = findViewById(R.id.inputServerView); + portView = findViewById(R.id.inputPortView); + QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); + dialogCancelButton.setChangeAlphaWhenPress(true); + dialogCancelButton.setOnClickListener(this); + + QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); + dialogConfirmButton.setChangeAlphaWhenPress(true); + dialogConfirmButton.setOnClickListener(this); + + if (!TextUtils.isEmpty(title)) { + dialogTitle.setText(title); + } + } + + @Override + public void onClick(View view) { + int i = view.getId(); + if (i == R.id.dialogCancelButton) { + if (listener != null) { + listener.onCancelClick(); + } + } else if (i == R.id.dialogConfirmButton) { + if (listener != null) { + String server = serverView.getText().toString().trim(); + String port = portView.getText().toString().trim(); + listener.onConfirmClick(server, port); + } + } + this.dismiss(); + } + + public static class Builder { + private Context mContext; + private String title; + private OnDialogClickListener listener; + + public Builder setContext(Context context) { + this.mContext = context; + return this; + } + + public Builder setTitle(String title) { + this.title = title; + return this; + } + + public Builder setOnDialogClickListener(OnDialogClickListener listener) { + this.listener = listener; + return this; + } + + public InputDialog build() { + return new InputDialog(this); + } + } + + public interface OnDialogClickListener { + void onConfirmClick(String serverValue, String portValue); + + void onCancelClick(); + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 0000000..f1d8414 --- /dev/null +++ b/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/build.gradle b/app/build.gradle index 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index d2958f4..9f86e54 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -35,7 +34,7 @@ @Override public Subscription sendRetrofitRequest(SubmitInfoBean infoBean) { - Observable observable = RetrofitServiceManager.submitCase(HttpConfig.BASE_IP, infoBean); + Observable observable = RetrofitServiceManager.submitCase(infoBean); 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/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index f48dbb9..cac6a2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(HttpConfig.BASE_IP, username, key); + Observable observable = RetrofitServiceManager.getTokenData(username, key); 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/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index a62efb8..e033292 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.UserBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getUserData(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.getUserData(); 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/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 9979749..7c2bbc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -144,7 +144,7 @@ infoBean.setFileIdVerify(""); infoBean.setBzhours(""); infoBean.setBzminis(""); - //定位 + //定位点经纬度 locationMap = new HashMap<>(); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override @@ -174,20 +174,12 @@ StringBuffer buffer = new StringBuffer(); try { Address address = geoCoder.getFromLocation(latitude, longitude, 1).get(0); -// Log.d(TAG, "getLocality: " + address.getLocality()); -// Log.d(TAG, "getSubLocality: " + address.getSubLocality()); -// Log.d(TAG, "getAdminArea: " + address.getAdminArea()); -// Log.d(TAG, "getSubAdminArea: " + address.getSubAdminArea()); -// Log.d(TAG, "getThoroughfare: " + address.getThoroughfare()); -// Log.d(TAG, "getSubThoroughfare: " + address.getSubThoroughfare()); buffer.append(address.getSubLocality()) .append(address.getSubAdminArea()) .append(address.getThoroughfare()) .append(address.getSubThoroughfare()); - // infoBean.setAreaCode(address.getSubLocality()); // infoBean.setStreetCode(address.getSubAdminArea()); - //保存经纬度，供地图页面定位 locationMap.put("longitude", longitude); locationMap.put("latitude", latitude); @@ -196,11 +188,6 @@ e.printStackTrace(); } communityNameView.setText(buffer); - -// CameraPosition cameraPosition = new CameraPosition(new LatLng(latitude, longitude), 15, 0, 30); -// CameraUpdate cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition); -// aMap.moveCamera(cameraUpdate); -// drawMarkers(latitude, longitude); } } @@ -390,7 +377,7 @@ @Override public void onItemClick(AdapterView parent, View view, int position, long id) { //查看大图 - showBigImage(selectList.get(position)); + showBigImage(selectList.get(position).getRealPath()); } }); //删除按钮点击事件 @@ -445,7 +432,7 @@ } } - private void showBigImage(LocalMedia localMedia) { + private void showBigImage(String path) { } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index d3d0fa1..979deff 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -16,10 +16,13 @@ import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; +import com.casic.dcms.widgets.InputDialog; +import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; @@ -43,6 +46,8 @@ CheckBox rememberPasswordView; @BindView(R.id.autoLoginView) CheckBox autoLoginView; + @BindView(R.id.changeServerConfigButton) + QMUIAlphaImageButton changeServerConfigButton; private QMUITipDialog loadingDialog; private AuthenticatePresenterImpl authenticatePresenter; @@ -87,15 +92,42 @@ @Override public void initEvent() { loginButton.setChangeAlphaWhenPress(true); + changeServerConfigButton.setChangeAlphaWhenPress(true); authenticatePresenter = new AuthenticatePresenterImpl(this); loginPresenter = new LoginPresenterImpl(this); } - @OnClick(R.id.loginButton) + @OnClick({R.id.loginButton, R.id.changeServerConfigButton}) @Override public void onClick(View v) { - //验证公钥 - authenticatePresenter.onReadyRetrofitRequest(); + switch (v.getId()) { + case R.id.loginButton: + //验证公钥 + authenticatePresenter.onReadyRetrofitRequest(); + break; + case R.id.changeServerConfigButton: + new InputDialog.Builder() + .setContext(this) + .setTitle("修改服务器地址和端口") + .setOnDialogClickListener(new InputDialog.OnDialogClickListener() { + @Override + public void onConfirmClick(String serverValue, String portValue) { + if (!TextUtils.isEmpty(serverValue) && !TextUtils.isEmpty(portValue)) { + String serverConfig = "http:" + serverValue + ":" + portValue; + SaveKeyValues.putValue(Constant.IP_KEY, serverConfig); + ToastHelper.showToast("服务器地址修改成功", ToastHelper.SUCCESS); + } + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + break; + default: + break; + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java index f079655..29393ee 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java @@ -122,6 +122,8 @@ uiSettings.setCompassEnabled(true); uiSettings.setCompassGravity(Gravity.TOP | Gravity.END); uiSettings.setCompassMargins(0, 20, 20, 0); + uiSettings.setAttributionEnabled(false);//去掉MapBox logo旁边的按钮 + uiSettings.setLogoEnabled(false);//去掉MapBox logo LocalizationPlugin localizationPlugin = new LocalizationPlugin(mapBoxView, map, style); localizationPlugin.setMapLanguage(MapLocale.SIMPLIFIED_CHINESE); } @@ -175,13 +177,14 @@ } break; case R.id.removeToLocalView: - position = builder.zoom(zoomScale).build(); + position = builder.zoom(15).build(); break; default: break; } if (position != null) { - map.moveCamera(CameraUpdateFactory.newCameraPosition(position)); + //缓慢缩放和移动地图 + map.animateCamera(CameraUpdateFactory.newCameraPosition(position), 2000); } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 49c80b7..8c90ccd 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -31,4 +31,6 @@ public static final int SELECT_PICTURE_CODE = 9001; public static final int PERMISSIONS_CODE = 999; + + public static final String IP_KEY = "BASE_IP"; } diff --git a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java index bd3eb2e..1815327 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java @@ -1,8 +1,5 @@ package com.casic.dcms.utils; public class HttpConfig { - public static final String BASE_IP = "http://111.198.10.15:11409"; public static final long HTTP_TIMEOUT = 30L; - public static final String HTTP_TOKEN_KET = ""; - public static final int REQUEST_TOKEN_INVALID = 0; } 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 9769a94..b557907 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 @@ -9,7 +9,9 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; import com.casic.dcms.bean.UserBean; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.HttpConfig; +import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.TokenHelper; import org.jetbrains.annotations.NotNull; @@ -26,9 +28,10 @@ public class RetrofitServiceManager { private static final String TAG = "RetrofitServiceManager"; - private static Retrofit createRetrofit(String baseUrl) { + private static Retrofit createRetrofit() { + String ip = (String) SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409"); return new Retrofit.Builder() - .baseUrl(baseUrl) + .baseUrl(ip) .addConverterFactory(GsonConverterFactory.create())//Gson转换器 .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) .client(createOKHttpClient())//log拦截器 @@ -54,8 +57,8 @@ /** * 验证PublicKey */ - public static Observable authenticate(String baseUrl) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable authenticate() { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getPublicKey(); } @@ -63,8 +66,8 @@ /** * 登录并获取Token */ - public static Observable getTokenData(String baseUrl, String username, String key) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getTokenData(String username, String key) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.login(username, key); } @@ -72,8 +75,8 @@ /** * 获取用户信息 */ - public static Observable getUserData(String baseUrl) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getUserData() { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getUser(TokenHelper.getToken()); } @@ -81,8 +84,8 @@ /** * 大类列表查询 */ - public static Observable getCaseLargeClass(String baseUrl, String eorc) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getCaseLargeClass(String eorc) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getLargeClass(TokenHelper.getToken(), eorc); } @@ -90,8 +93,8 @@ /** * 大类列表查询 */ - public static Observable getCaseSmallClass(String baseUrl, String eorc, String typeId) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getCaseSmallClass(String eorc, String typeId) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getLargeClass(TokenHelper.getToken(), eorc, typeId); } @@ -99,8 +102,8 @@ /** * 提交案卷 */ - public static Observable submitCase(String baseUrl, SubmitInfoBean infoBean) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable submitCase(SubmitInfoBean infoBean) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.submit(TokenHelper.getToken(), infoBean); } diff --git a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java new file mode 100644 index 0000000..2a358c0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java @@ -0,0 +1,41 @@ +package com.casic.dcms.widgets; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +/** + * @author : Pengxh + * @time : 2021/4/13 16:32 + * @email : 290677893@qq.com + **/ +public class BigPictureDialog extends DialogFragment { + + private static final String TAG = "BigPictureDialog"; + private View mRootView; + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + //对话框的布局 + if (mRootView == null) { + mRootView = inflater.inflate(R.layout.dialog_big_picture, container, false); + } + Bundle bundle = getArguments(); + if (bundle != null) { + String path = bundle.getString("path"); + QMUIRadiusImageView radiusImageView = mRootView.findViewById(R.id.bigPictureView); + Glide.with(this).load(path).into(radiusImageView); + } + return mRootView; + } +} diff --git a/app/src/main/java/com/casic/dcms/widgets/InputDialog.java b/app/src/main/java/com/casic/dcms/widgets/InputDialog.java new file mode 100644 index 0000000..36def9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/widgets/InputDialog.java @@ -0,0 +1,104 @@ +package com.casic.dcms.widgets; + +import android.app.Dialog; +import android.content.Context; +import android.os.Bundle; +import android.text.TextUtils; +import android.view.View; +import android.widget.EditText; +import android.widget.TextView; + +import com.casic.dcms.R; +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; + +/** + * @Author: Pengxh + * @Time: 2021/4/13 13:18 + * @Email: 290677893@qq.com + **/ +public class InputDialog extends Dialog implements View.OnClickListener { + + private static final String TAG = "InputDialog"; + private String title; + private OnDialogClickListener listener; + private EditText serverView; + private EditText portView; + + private InputDialog(Builder builder) { + super(builder.mContext); + this.title = builder.title; + this.listener = builder.listener; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.dialog_input); + initView(); + } + + private void initView() { + TextView dialogTitle = findViewById(R.id.dialogTitle); + serverView = findViewById(R.id.inputServerView); + portView = findViewById(R.id.inputPortView); + QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); + dialogCancelButton.setChangeAlphaWhenPress(true); + dialogCancelButton.setOnClickListener(this); + + QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); + dialogConfirmButton.setChangeAlphaWhenPress(true); + dialogConfirmButton.setOnClickListener(this); + + if (!TextUtils.isEmpty(title)) { + dialogTitle.setText(title); + } + } + + @Override + public void onClick(View view) { + int i = view.getId(); + if (i == R.id.dialogCancelButton) { + if (listener != null) { + listener.onCancelClick(); + } + } else if (i == R.id.dialogConfirmButton) { + if (listener != null) { + String server = serverView.getText().toString().trim(); + String port = portView.getText().toString().trim(); + listener.onConfirmClick(server, port); + } + } + this.dismiss(); + } + + public static class Builder { + private Context mContext; + private String title; + private OnDialogClickListener listener; + + public Builder setContext(Context context) { + this.mContext = context; + return this; + } + + public Builder setTitle(String title) { + this.title = title; + return this; + } + + public Builder setOnDialogClickListener(OnDialogClickListener listener) { + this.listener = listener; + return this; + } + + public InputDialog build() { + return new InputDialog(this); + } + } + + public interface OnDialogClickListener { + void onConfirmClick(String serverValue, String portValue); + + void onCancelClick(); + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 0000000..f1d8414 --- /dev/null +++ b/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 481a769..39020df 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -90,5 +90,17 @@ android:layout_height="180dp" android:layout_alignParentBottom="true" android:background="@drawable/bg_enter_bottom" /> + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index d2958f4..9f86e54 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -35,7 +34,7 @@ @Override public Subscription sendRetrofitRequest(SubmitInfoBean infoBean) { - Observable observable = RetrofitServiceManager.submitCase(HttpConfig.BASE_IP, infoBean); + Observable observable = RetrofitServiceManager.submitCase(infoBean); 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/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index f48dbb9..cac6a2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(HttpConfig.BASE_IP, username, key); + Observable observable = RetrofitServiceManager.getTokenData(username, key); 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/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index a62efb8..e033292 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.UserBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getUserData(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.getUserData(); 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/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 9979749..7c2bbc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -144,7 +144,7 @@ infoBean.setFileIdVerify(""); infoBean.setBzhours(""); infoBean.setBzminis(""); - //定位 + //定位点经纬度 locationMap = new HashMap<>(); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override @@ -174,20 +174,12 @@ StringBuffer buffer = new StringBuffer(); try { Address address = geoCoder.getFromLocation(latitude, longitude, 1).get(0); -// Log.d(TAG, "getLocality: " + address.getLocality()); -// Log.d(TAG, "getSubLocality: " + address.getSubLocality()); -// Log.d(TAG, "getAdminArea: " + address.getAdminArea()); -// Log.d(TAG, "getSubAdminArea: " + address.getSubAdminArea()); -// Log.d(TAG, "getThoroughfare: " + address.getThoroughfare()); -// Log.d(TAG, "getSubThoroughfare: " + address.getSubThoroughfare()); buffer.append(address.getSubLocality()) .append(address.getSubAdminArea()) .append(address.getThoroughfare()) .append(address.getSubThoroughfare()); - // infoBean.setAreaCode(address.getSubLocality()); // infoBean.setStreetCode(address.getSubAdminArea()); - //保存经纬度，供地图页面定位 locationMap.put("longitude", longitude); locationMap.put("latitude", latitude); @@ -196,11 +188,6 @@ e.printStackTrace(); } communityNameView.setText(buffer); - -// CameraPosition cameraPosition = new CameraPosition(new LatLng(latitude, longitude), 15, 0, 30); -// CameraUpdate cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition); -// aMap.moveCamera(cameraUpdate); -// drawMarkers(latitude, longitude); } } @@ -390,7 +377,7 @@ @Override public void onItemClick(AdapterView parent, View view, int position, long id) { //查看大图 - showBigImage(selectList.get(position)); + showBigImage(selectList.get(position).getRealPath()); } }); //删除按钮点击事件 @@ -445,7 +432,7 @@ } } - private void showBigImage(LocalMedia localMedia) { + private void showBigImage(String path) { } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index d3d0fa1..979deff 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -16,10 +16,13 @@ import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; +import com.casic.dcms.widgets.InputDialog; +import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; @@ -43,6 +46,8 @@ CheckBox rememberPasswordView; @BindView(R.id.autoLoginView) CheckBox autoLoginView; + @BindView(R.id.changeServerConfigButton) + QMUIAlphaImageButton changeServerConfigButton; private QMUITipDialog loadingDialog; private AuthenticatePresenterImpl authenticatePresenter; @@ -87,15 +92,42 @@ @Override public void initEvent() { loginButton.setChangeAlphaWhenPress(true); + changeServerConfigButton.setChangeAlphaWhenPress(true); authenticatePresenter = new AuthenticatePresenterImpl(this); loginPresenter = new LoginPresenterImpl(this); } - @OnClick(R.id.loginButton) + @OnClick({R.id.loginButton, R.id.changeServerConfigButton}) @Override public void onClick(View v) { - //验证公钥 - authenticatePresenter.onReadyRetrofitRequest(); + switch (v.getId()) { + case R.id.loginButton: + //验证公钥 + authenticatePresenter.onReadyRetrofitRequest(); + break; + case R.id.changeServerConfigButton: + new InputDialog.Builder() + .setContext(this) + .setTitle("修改服务器地址和端口") + .setOnDialogClickListener(new InputDialog.OnDialogClickListener() { + @Override + public void onConfirmClick(String serverValue, String portValue) { + if (!TextUtils.isEmpty(serverValue) && !TextUtils.isEmpty(portValue)) { + String serverConfig = "http:" + serverValue + ":" + portValue; + SaveKeyValues.putValue(Constant.IP_KEY, serverConfig); + ToastHelper.showToast("服务器地址修改成功", ToastHelper.SUCCESS); + } + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + break; + default: + break; + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java index f079655..29393ee 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java @@ -122,6 +122,8 @@ uiSettings.setCompassEnabled(true); uiSettings.setCompassGravity(Gravity.TOP | Gravity.END); uiSettings.setCompassMargins(0, 20, 20, 0); + uiSettings.setAttributionEnabled(false);//去掉MapBox logo旁边的按钮 + uiSettings.setLogoEnabled(false);//去掉MapBox logo LocalizationPlugin localizationPlugin = new LocalizationPlugin(mapBoxView, map, style); localizationPlugin.setMapLanguage(MapLocale.SIMPLIFIED_CHINESE); } @@ -175,13 +177,14 @@ } break; case R.id.removeToLocalView: - position = builder.zoom(zoomScale).build(); + position = builder.zoom(15).build(); break; default: break; } if (position != null) { - map.moveCamera(CameraUpdateFactory.newCameraPosition(position)); + //缓慢缩放和移动地图 + map.animateCamera(CameraUpdateFactory.newCameraPosition(position), 2000); } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 49c80b7..8c90ccd 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -31,4 +31,6 @@ public static final int SELECT_PICTURE_CODE = 9001; public static final int PERMISSIONS_CODE = 999; + + public static final String IP_KEY = "BASE_IP"; } diff --git a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java index bd3eb2e..1815327 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java @@ -1,8 +1,5 @@ package com.casic.dcms.utils; public class HttpConfig { - public static final String BASE_IP = "http://111.198.10.15:11409"; public static final long HTTP_TIMEOUT = 30L; - public static final String HTTP_TOKEN_KET = ""; - public static final int REQUEST_TOKEN_INVALID = 0; } 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 9769a94..b557907 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 @@ -9,7 +9,9 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; import com.casic.dcms.bean.UserBean; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.HttpConfig; +import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.TokenHelper; import org.jetbrains.annotations.NotNull; @@ -26,9 +28,10 @@ public class RetrofitServiceManager { private static final String TAG = "RetrofitServiceManager"; - private static Retrofit createRetrofit(String baseUrl) { + private static Retrofit createRetrofit() { + String ip = (String) SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409"); return new Retrofit.Builder() - .baseUrl(baseUrl) + .baseUrl(ip) .addConverterFactory(GsonConverterFactory.create())//Gson转换器 .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) .client(createOKHttpClient())//log拦截器 @@ -54,8 +57,8 @@ /** * 验证PublicKey */ - public static Observable authenticate(String baseUrl) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable authenticate() { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getPublicKey(); } @@ -63,8 +66,8 @@ /** * 登录并获取Token */ - public static Observable getTokenData(String baseUrl, String username, String key) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getTokenData(String username, String key) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.login(username, key); } @@ -72,8 +75,8 @@ /** * 获取用户信息 */ - public static Observable getUserData(String baseUrl) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getUserData() { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getUser(TokenHelper.getToken()); } @@ -81,8 +84,8 @@ /** * 大类列表查询 */ - public static Observable getCaseLargeClass(String baseUrl, String eorc) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getCaseLargeClass(String eorc) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getLargeClass(TokenHelper.getToken(), eorc); } @@ -90,8 +93,8 @@ /** * 大类列表查询 */ - public static Observable getCaseSmallClass(String baseUrl, String eorc, String typeId) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getCaseSmallClass(String eorc, String typeId) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getLargeClass(TokenHelper.getToken(), eorc, typeId); } @@ -99,8 +102,8 @@ /** * 提交案卷 */ - public static Observable submitCase(String baseUrl, SubmitInfoBean infoBean) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable submitCase(SubmitInfoBean infoBean) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.submit(TokenHelper.getToken(), infoBean); } diff --git a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java new file mode 100644 index 0000000..2a358c0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java @@ -0,0 +1,41 @@ +package com.casic.dcms.widgets; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +/** + * @author : Pengxh + * @time : 2021/4/13 16:32 + * @email : 290677893@qq.com + **/ +public class BigPictureDialog extends DialogFragment { + + private static final String TAG = "BigPictureDialog"; + private View mRootView; + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + //对话框的布局 + if (mRootView == null) { + mRootView = inflater.inflate(R.layout.dialog_big_picture, container, false); + } + Bundle bundle = getArguments(); + if (bundle != null) { + String path = bundle.getString("path"); + QMUIRadiusImageView radiusImageView = mRootView.findViewById(R.id.bigPictureView); + Glide.with(this).load(path).into(radiusImageView); + } + return mRootView; + } +} diff --git a/app/src/main/java/com/casic/dcms/widgets/InputDialog.java b/app/src/main/java/com/casic/dcms/widgets/InputDialog.java new file mode 100644 index 0000000..36def9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/widgets/InputDialog.java @@ -0,0 +1,104 @@ +package com.casic.dcms.widgets; + +import android.app.Dialog; +import android.content.Context; +import android.os.Bundle; +import android.text.TextUtils; +import android.view.View; +import android.widget.EditText; +import android.widget.TextView; + +import com.casic.dcms.R; +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; + +/** + * @Author: Pengxh + * @Time: 2021/4/13 13:18 + * @Email: 290677893@qq.com + **/ +public class InputDialog extends Dialog implements View.OnClickListener { + + private static final String TAG = "InputDialog"; + private String title; + private OnDialogClickListener listener; + private EditText serverView; + private EditText portView; + + private InputDialog(Builder builder) { + super(builder.mContext); + this.title = builder.title; + this.listener = builder.listener; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.dialog_input); + initView(); + } + + private void initView() { + TextView dialogTitle = findViewById(R.id.dialogTitle); + serverView = findViewById(R.id.inputServerView); + portView = findViewById(R.id.inputPortView); + QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); + dialogCancelButton.setChangeAlphaWhenPress(true); + dialogCancelButton.setOnClickListener(this); + + QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); + dialogConfirmButton.setChangeAlphaWhenPress(true); + dialogConfirmButton.setOnClickListener(this); + + if (!TextUtils.isEmpty(title)) { + dialogTitle.setText(title); + } + } + + @Override + public void onClick(View view) { + int i = view.getId(); + if (i == R.id.dialogCancelButton) { + if (listener != null) { + listener.onCancelClick(); + } + } else if (i == R.id.dialogConfirmButton) { + if (listener != null) { + String server = serverView.getText().toString().trim(); + String port = portView.getText().toString().trim(); + listener.onConfirmClick(server, port); + } + } + this.dismiss(); + } + + public static class Builder { + private Context mContext; + private String title; + private OnDialogClickListener listener; + + public Builder setContext(Context context) { + this.mContext = context; + return this; + } + + public Builder setTitle(String title) { + this.title = title; + return this; + } + + public Builder setOnDialogClickListener(OnDialogClickListener listener) { + this.listener = listener; + return this; + } + + public InputDialog build() { + return new InputDialog(this); + } + } + + public interface OnDialogClickListener { + void onConfirmClick(String serverValue, String portValue); + + void onCancelClick(); + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 0000000..f1d8414 --- /dev/null +++ b/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 481a769..39020df 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -90,5 +90,17 @@ android:layout_height="180dp" android:layout_alignParentBottom="true" android:background="@drawable/bg_enter_bottom" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_big_picture.xml b/app/src/main/res/layout/dialog_big_picture.xml new file mode 100644 index 0000000..42a4438 --- /dev/null +++ b/app/src/main/res/layout/dialog_big_picture.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 1075459..4b8dfb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,4 +69,6 @@ implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' implementation 'com.sdsmdg.tastytoast:tastytoast:0.1.1' + //广告Banner + implementation 'com.youth.banner:banner:1.4.9' } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index b3361da..7984cdd 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.PublicKeyBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -26,7 +25,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.authenticate(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.authenticate(); 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/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 9fa7733..6b1a217 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(HttpConfig.BASE_IP, eorc); + Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); 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/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index 928bf59..6b4c65d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -20,7 +19,7 @@ @Override public Subscription sendRetrofitRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(HttpConfig.BASE_IP, eorc, typeId); + Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); 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/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index d2958f4..9f86e54 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -35,7 +34,7 @@ @Override public Subscription sendRetrofitRequest(SubmitInfoBean infoBean) { - Observable observable = RetrofitServiceManager.submitCase(HttpConfig.BASE_IP, infoBean); + Observable observable = RetrofitServiceManager.submitCase(infoBean); 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/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index f48dbb9..cac6a2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(HttpConfig.BASE_IP, username, key); + Observable observable = RetrofitServiceManager.getTokenData(username, key); 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/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index a62efb8..e033292 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -1,7 +1,6 @@ package com.casic.dcms.mvp.model; import com.casic.dcms.bean.UserBean; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -30,7 +29,7 @@ @Override public Subscription sendRetrofitRequest() { - Observable observable = RetrofitServiceManager.getUserData(HttpConfig.BASE_IP); + Observable observable = RetrofitServiceManager.getUserData(); 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/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 9979749..7c2bbc6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -144,7 +144,7 @@ infoBean.setFileIdVerify(""); infoBean.setBzhours(""); infoBean.setBzminis(""); - //定位 + //定位点经纬度 locationMap = new HashMap<>(); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override @@ -174,20 +174,12 @@ StringBuffer buffer = new StringBuffer(); try { Address address = geoCoder.getFromLocation(latitude, longitude, 1).get(0); -// Log.d(TAG, "getLocality: " + address.getLocality()); -// Log.d(TAG, "getSubLocality: " + address.getSubLocality()); -// Log.d(TAG, "getAdminArea: " + address.getAdminArea()); -// Log.d(TAG, "getSubAdminArea: " + address.getSubAdminArea()); -// Log.d(TAG, "getThoroughfare: " + address.getThoroughfare()); -// Log.d(TAG, "getSubThoroughfare: " + address.getSubThoroughfare()); buffer.append(address.getSubLocality()) .append(address.getSubAdminArea()) .append(address.getThoroughfare()) .append(address.getSubThoroughfare()); - // infoBean.setAreaCode(address.getSubLocality()); // infoBean.setStreetCode(address.getSubAdminArea()); - //保存经纬度，供地图页面定位 locationMap.put("longitude", longitude); locationMap.put("latitude", latitude); @@ -196,11 +188,6 @@ e.printStackTrace(); } communityNameView.setText(buffer); - -// CameraPosition cameraPosition = new CameraPosition(new LatLng(latitude, longitude), 15, 0, 30); -// CameraUpdate cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition); -// aMap.moveCamera(cameraUpdate); -// drawMarkers(latitude, longitude); } } @@ -390,7 +377,7 @@ @Override public void onItemClick(AdapterView parent, View view, int position, long id) { //查看大图 - showBigImage(selectList.get(position)); + showBigImage(selectList.get(position).getRealPath()); } }); //删除按钮点击事件 @@ -445,7 +432,7 @@ } } - private void showBigImage(LocalMedia localMedia) { + private void showBigImage(String path) { } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index d3d0fa1..979deff 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -16,10 +16,13 @@ import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.RSAUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; +import com.casic.dcms.widgets.InputDialog; +import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; @@ -43,6 +46,8 @@ CheckBox rememberPasswordView; @BindView(R.id.autoLoginView) CheckBox autoLoginView; + @BindView(R.id.changeServerConfigButton) + QMUIAlphaImageButton changeServerConfigButton; private QMUITipDialog loadingDialog; private AuthenticatePresenterImpl authenticatePresenter; @@ -87,15 +92,42 @@ @Override public void initEvent() { loginButton.setChangeAlphaWhenPress(true); + changeServerConfigButton.setChangeAlphaWhenPress(true); authenticatePresenter = new AuthenticatePresenterImpl(this); loginPresenter = new LoginPresenterImpl(this); } - @OnClick(R.id.loginButton) + @OnClick({R.id.loginButton, R.id.changeServerConfigButton}) @Override public void onClick(View v) { - //验证公钥 - authenticatePresenter.onReadyRetrofitRequest(); + switch (v.getId()) { + case R.id.loginButton: + //验证公钥 + authenticatePresenter.onReadyRetrofitRequest(); + break; + case R.id.changeServerConfigButton: + new InputDialog.Builder() + .setContext(this) + .setTitle("修改服务器地址和端口") + .setOnDialogClickListener(new InputDialog.OnDialogClickListener() { + @Override + public void onConfirmClick(String serverValue, String portValue) { + if (!TextUtils.isEmpty(serverValue) && !TextUtils.isEmpty(portValue)) { + String serverConfig = "http:" + serverValue + ":" + portValue; + SaveKeyValues.putValue(Constant.IP_KEY, serverConfig); + ToastHelper.showToast("服务器地址修改成功", ToastHelper.SUCCESS); + } + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + break; + default: + break; + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java index f079655..29393ee 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapBoxActivity.java @@ -122,6 +122,8 @@ uiSettings.setCompassEnabled(true); uiSettings.setCompassGravity(Gravity.TOP | Gravity.END); uiSettings.setCompassMargins(0, 20, 20, 0); + uiSettings.setAttributionEnabled(false);//去掉MapBox logo旁边的按钮 + uiSettings.setLogoEnabled(false);//去掉MapBox logo LocalizationPlugin localizationPlugin = new LocalizationPlugin(mapBoxView, map, style); localizationPlugin.setMapLanguage(MapLocale.SIMPLIFIED_CHINESE); } @@ -175,13 +177,14 @@ } break; case R.id.removeToLocalView: - position = builder.zoom(zoomScale).build(); + position = builder.zoom(15).build(); break; default: break; } if (position != null) { - map.moveCamera(CameraUpdateFactory.newCameraPosition(position)); + //缓慢缩放和移动地图 + map.animateCamera(CameraUpdateFactory.newCameraPosition(position), 2000); } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 49c80b7..8c90ccd 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -31,4 +31,6 @@ public static final int SELECT_PICTURE_CODE = 9001; public static final int PERMISSIONS_CODE = 999; + + public static final String IP_KEY = "BASE_IP"; } diff --git a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java index bd3eb2e..1815327 100644 --- a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java +++ b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java @@ -1,8 +1,5 @@ package com.casic.dcms.utils; public class HttpConfig { - public static final String BASE_IP = "http://111.198.10.15:11409"; public static final long HTTP_TIMEOUT = 30L; - public static final String HTTP_TOKEN_KET = ""; - public static final int REQUEST_TOKEN_INVALID = 0; } 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 9769a94..b557907 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 @@ -9,7 +9,9 @@ import com.casic.dcms.bean.SubmitInfoBean; import com.casic.dcms.bean.SubmitResultBean; import com.casic.dcms.bean.UserBean; +import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.HttpConfig; +import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.TokenHelper; import org.jetbrains.annotations.NotNull; @@ -26,9 +28,10 @@ public class RetrofitServiceManager { private static final String TAG = "RetrofitServiceManager"; - private static Retrofit createRetrofit(String baseUrl) { + private static Retrofit createRetrofit() { + String ip = (String) SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409"); return new Retrofit.Builder() - .baseUrl(baseUrl) + .baseUrl(ip) .addConverterFactory(GsonConverterFactory.create())//Gson转换器 .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) .client(createOKHttpClient())//log拦截器 @@ -54,8 +57,8 @@ /** * 验证PublicKey */ - public static Observable authenticate(String baseUrl) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable authenticate() { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getPublicKey(); } @@ -63,8 +66,8 @@ /** * 登录并获取Token */ - public static Observable getTokenData(String baseUrl, String username, String key) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getTokenData(String username, String key) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.login(username, key); } @@ -72,8 +75,8 @@ /** * 获取用户信息 */ - public static Observable getUserData(String baseUrl) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getUserData() { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getUser(TokenHelper.getToken()); } @@ -81,8 +84,8 @@ /** * 大类列表查询 */ - public static Observable getCaseLargeClass(String baseUrl, String eorc) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getCaseLargeClass(String eorc) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getLargeClass(TokenHelper.getToken(), eorc); } @@ -90,8 +93,8 @@ /** * 大类列表查询 */ - public static Observable getCaseSmallClass(String baseUrl, String eorc, String typeId) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable getCaseSmallClass(String eorc, String typeId) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.getLargeClass(TokenHelper.getToken(), eorc, typeId); } @@ -99,8 +102,8 @@ /** * 提交案卷 */ - public static Observable submitCase(String baseUrl, SubmitInfoBean infoBean) { - Retrofit retrofit = createRetrofit(baseUrl); + public static Observable submitCase(SubmitInfoBean infoBean) { + Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.submit(TokenHelper.getToken(), infoBean); } diff --git a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java new file mode 100644 index 0000000..2a358c0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java @@ -0,0 +1,41 @@ +package com.casic.dcms.widgets; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +/** + * @author : Pengxh + * @time : 2021/4/13 16:32 + * @email : 290677893@qq.com + **/ +public class BigPictureDialog extends DialogFragment { + + private static final String TAG = "BigPictureDialog"; + private View mRootView; + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + //对话框的布局 + if (mRootView == null) { + mRootView = inflater.inflate(R.layout.dialog_big_picture, container, false); + } + Bundle bundle = getArguments(); + if (bundle != null) { + String path = bundle.getString("path"); + QMUIRadiusImageView radiusImageView = mRootView.findViewById(R.id.bigPictureView); + Glide.with(this).load(path).into(radiusImageView); + } + return mRootView; + } +} diff --git a/app/src/main/java/com/casic/dcms/widgets/InputDialog.java b/app/src/main/java/com/casic/dcms/widgets/InputDialog.java new file mode 100644 index 0000000..36def9c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/widgets/InputDialog.java @@ -0,0 +1,104 @@ +package com.casic.dcms.widgets; + +import android.app.Dialog; +import android.content.Context; +import android.os.Bundle; +import android.text.TextUtils; +import android.view.View; +import android.widget.EditText; +import android.widget.TextView; + +import com.casic.dcms.R; +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; + +/** + * @Author: Pengxh + * @Time: 2021/4/13 13:18 + * @Email: 290677893@qq.com + **/ +public class InputDialog extends Dialog implements View.OnClickListener { + + private static final String TAG = "InputDialog"; + private String title; + private OnDialogClickListener listener; + private EditText serverView; + private EditText portView; + + private InputDialog(Builder builder) { + super(builder.mContext); + this.title = builder.title; + this.listener = builder.listener; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.dialog_input); + initView(); + } + + private void initView() { + TextView dialogTitle = findViewById(R.id.dialogTitle); + serverView = findViewById(R.id.inputServerView); + portView = findViewById(R.id.inputPortView); + QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); + dialogCancelButton.setChangeAlphaWhenPress(true); + dialogCancelButton.setOnClickListener(this); + + QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); + dialogConfirmButton.setChangeAlphaWhenPress(true); + dialogConfirmButton.setOnClickListener(this); + + if (!TextUtils.isEmpty(title)) { + dialogTitle.setText(title); + } + } + + @Override + public void onClick(View view) { + int i = view.getId(); + if (i == R.id.dialogCancelButton) { + if (listener != null) { + listener.onCancelClick(); + } + } else if (i == R.id.dialogConfirmButton) { + if (listener != null) { + String server = serverView.getText().toString().trim(); + String port = portView.getText().toString().trim(); + listener.onConfirmClick(server, port); + } + } + this.dismiss(); + } + + public static class Builder { + private Context mContext; + private String title; + private OnDialogClickListener listener; + + public Builder setContext(Context context) { + this.mContext = context; + return this; + } + + public Builder setTitle(String title) { + this.title = title; + return this; + } + + public Builder setOnDialogClickListener(OnDialogClickListener listener) { + this.listener = listener; + return this; + } + + public InputDialog build() { + return new InputDialog(this); + } + } + + public interface OnDialogClickListener { + void onConfirmClick(String serverValue, String portValue); + + void onCancelClick(); + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 0000000..f1d8414 --- /dev/null +++ b/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 481a769..39020df 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -90,5 +90,17 @@ android:layout_height="180dp" android:layout_alignParentBottom="true" android:background="@drawable/bg_enter_bottom" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_big_picture.xml b/app/src/main/res/layout/dialog_big_picture.xml new file mode 100644 index 0000000..42a4438 --- /dev/null +++ b/app/src/main/res/layout/dialog_big_picture.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_input.xml b/app/src/main/res/layout/dialog_input.xml new file mode 100644 index 0000000..905527b --- /dev/null +++ b/app/src/main/res/layout/dialog_input.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + \ No newline at end of file