diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 0dcdd9b..41800f2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -229,7 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -465,6 +465,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { if (largeClassBean.isSuccess()) { //设置大类数据 @@ -620,7 +625,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 0dcdd9b..41800f2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -229,7 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -465,6 +465,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { if (largeClassBean.isSuccess()) { //设置大类数据 @@ -620,7 +625,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 93120d6..0f065e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -114,4 +114,9 @@ finish(); } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 0dcdd9b..41800f2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -229,7 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -465,6 +465,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { if (largeClassBean.isSuccess()) { //设置大类数据 @@ -620,7 +625,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 93120d6..0f065e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -114,4 +114,9 @@ finish(); } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 8ccc0ca..e5bdf09 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -210,14 +210,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -250,6 +256,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainUploadAudioResult(ActionResultBean resultBean) { } @@ -274,7 +285,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 0dcdd9b..41800f2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -229,7 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -465,6 +465,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { if (largeClassBean.isSuccess()) { //设置大类数据 @@ -620,7 +625,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 93120d6..0f065e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -114,4 +114,9 @@ finish(); } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 8ccc0ca..e5bdf09 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -210,14 +210,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -250,6 +256,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainUploadAudioResult(ActionResultBean resultBean) { } @@ -274,7 +285,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 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 d209555..542a90e 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -3,7 +3,6 @@ import android.content.Intent; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -23,7 +22,6 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; import com.casic.dcms.widgets.InputDialog; -import com.google.gson.Gson; import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -193,6 +191,11 @@ } @Override + public void loginFail() { + ToastHelper.showToast("登录失败，请检查账号密码", ToastHelper.ERROR); + } + + @Override public void hideProgress() { loadingDialog.hide(); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 0dcdd9b..41800f2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -229,7 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -465,6 +465,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { if (largeClassBean.isSuccess()) { //设置大类数据 @@ -620,7 +625,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 93120d6..0f065e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -114,4 +114,9 @@ finish(); } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 8ccc0ca..e5bdf09 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -210,14 +210,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -250,6 +256,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainUploadAudioResult(ActionResultBean resultBean) { } @@ -274,7 +285,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 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 d209555..542a90e 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -3,7 +3,6 @@ import android.content.Intent; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -23,7 +22,6 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; import com.casic.dcms.widgets.InputDialog; -import com.google.gson.Gson; import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -193,6 +191,11 @@ } @Override + public void loginFail() { + ToastHelper.showToast("登录失败，请检查账号密码", ToastHelper.ERROR); + } + + @Override public void hideProgress() { loadingDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index 7b095fb..78880dc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -30,6 +30,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -147,6 +148,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息超时", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 0dcdd9b..41800f2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -229,7 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -465,6 +465,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { if (largeClassBean.isSuccess()) { //设置大类数据 @@ -620,7 +625,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 93120d6..0f065e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -114,4 +114,9 @@ finish(); } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 8ccc0ca..e5bdf09 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -210,14 +210,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -250,6 +256,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainUploadAudioResult(ActionResultBean resultBean) { } @@ -274,7 +285,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 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 d209555..542a90e 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -3,7 +3,6 @@ import android.content.Intent; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -23,7 +22,6 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; import com.casic.dcms.widgets.InputDialog; -import com.google.gson.Gson; import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -193,6 +191,11 @@ } @Override + public void loginFail() { + ToastHelper.showToast("登录失败，请检查账号密码", ToastHelper.ERROR); + } + + @Override public void hideProgress() { loadingDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index 7b095fb..78880dc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -30,6 +30,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -147,6 +148,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息超时", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index d82b56b..154d77d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -141,6 +141,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (loginOutPresenter != null) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 0dcdd9b..41800f2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -229,7 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -465,6 +465,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { if (largeClassBean.isSuccess()) { //设置大类数据 @@ -620,7 +625,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 93120d6..0f065e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -114,4 +114,9 @@ finish(); } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 8ccc0ca..e5bdf09 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -210,14 +210,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -250,6 +256,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainUploadAudioResult(ActionResultBean resultBean) { } @@ -274,7 +285,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 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 d209555..542a90e 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -3,7 +3,6 @@ import android.content.Intent; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -23,7 +22,6 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; import com.casic.dcms.widgets.InputDialog; -import com.google.gson.Gson; import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -193,6 +191,11 @@ } @Override + public void loginFail() { + ToastHelper.showToast("登录失败，请检查账号密码", ToastHelper.ERROR); + } + + @Override public void hideProgress() { loadingDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index 7b095fb..78880dc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -30,6 +30,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -147,6 +148,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息超时", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index d82b56b..154d77d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -141,6 +141,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (loginOutPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index d0e0ec6..62b84dd 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -3,15 +3,15 @@ import android.content.Context; import android.content.Intent; -import com.casic.dcms.ui.BigPictureActivity; import com.casic.dcms.ui.CaseProcessActivity; +import com.casic.dcms.widgets.BigPictureDialog; + +import java.util.List; public class OtherUtils { //查看大图 - public static void showBigImage(Context context, String imagePath) { - Intent intent = new Intent(context, BigPictureActivity.class); - intent.putExtra("path", imagePath); - context.startActivity(intent); + public static void showBigImage(Context context, int index, List imageList) { + new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); } //查看案卷处理记录 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 0dcdd9b..41800f2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -229,7 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -465,6 +465,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { if (largeClassBean.isSuccess()) { //设置大类数据 @@ -620,7 +625,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 93120d6..0f065e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -114,4 +114,9 @@ finish(); } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 8ccc0ca..e5bdf09 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -210,14 +210,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -250,6 +256,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainUploadAudioResult(ActionResultBean resultBean) { } @@ -274,7 +285,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 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 d209555..542a90e 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -3,7 +3,6 @@ import android.content.Intent; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -23,7 +22,6 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; import com.casic.dcms.widgets.InputDialog; -import com.google.gson.Gson; import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -193,6 +191,11 @@ } @Override + public void loginFail() { + ToastHelper.showToast("登录失败，请检查账号密码", ToastHelper.ERROR); + } + + @Override public void hideProgress() { loadingDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index 7b095fb..78880dc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -30,6 +30,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -147,6 +148,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息超时", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index d82b56b..154d77d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -141,6 +141,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (loginOutPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index d0e0ec6..62b84dd 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -3,15 +3,15 @@ import android.content.Context; import android.content.Intent; -import com.casic.dcms.ui.BigPictureActivity; import com.casic.dcms.ui.CaseProcessActivity; +import com.casic.dcms.widgets.BigPictureDialog; + +import java.util.List; public class OtherUtils { //查看大图 - public static void showBigImage(Context context, String imagePath) { - Intent intent = new Intent(context, BigPictureActivity.class); - intent.putExtra("path", imagePath); - context.startActivity(intent); + public static void showBigImage(Context context, int index, List imageList) { + new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); } //查看案卷处理记录 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 0412275..9cdf5a1 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 @@ -1,7 +1,5 @@ package com.casic.dcms.utils.retrofit; -import android.util.Log; - import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseCheckedBean; @@ -65,7 +63,7 @@ HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() { @Override public void log(@NotNull String message) { - Log.d(TAG, "log: " + message); +// Log.d(TAG, "log: " + message); } }); interceptor.setLevel(HttpLoggingInterceptor.Level.BODY); diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 0dcdd9b..41800f2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -229,7 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -465,6 +465,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { if (largeClassBean.isSuccess()) { //设置大类数据 @@ -620,7 +625,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 93120d6..0f065e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -114,4 +114,9 @@ finish(); } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 8ccc0ca..e5bdf09 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -210,14 +210,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -250,6 +256,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainUploadAudioResult(ActionResultBean resultBean) { } @@ -274,7 +285,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 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 d209555..542a90e 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -3,7 +3,6 @@ import android.content.Intent; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -23,7 +22,6 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; import com.casic.dcms.widgets.InputDialog; -import com.google.gson.Gson; import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -193,6 +191,11 @@ } @Override + public void loginFail() { + ToastHelper.showToast("登录失败，请检查账号密码", ToastHelper.ERROR); + } + + @Override public void hideProgress() { loadingDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index 7b095fb..78880dc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -30,6 +30,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -147,6 +148,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息超时", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index d82b56b..154d77d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -141,6 +141,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (loginOutPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index d0e0ec6..62b84dd 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -3,15 +3,15 @@ import android.content.Context; import android.content.Intent; -import com.casic.dcms.ui.BigPictureActivity; import com.casic.dcms.ui.CaseProcessActivity; +import com.casic.dcms.widgets.BigPictureDialog; + +import java.util.List; public class OtherUtils { //查看大图 - public static void showBigImage(Context context, String imagePath) { - Intent intent = new Intent(context, BigPictureActivity.class); - intent.putExtra("path", imagePath); - context.startActivity(intent); + public static void showBigImage(Context context, int index, List imageList) { + new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); } //查看案卷处理记录 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 0412275..9cdf5a1 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 @@ -1,7 +1,5 @@ package com.casic.dcms.utils.retrofit; -import android.util.Log; - import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseCheckedBean; @@ -65,7 +63,7 @@ HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() { @Override public void log(@NotNull String message) { - Log.d(TAG, "log: " + message); +// Log.d(TAG, "log: " + message); } }); interceptor.setLevel(HttpLoggingInterceptor.Level.BODY); diff --git a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java index 2a358c0..3e6ed4e 100644 --- a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java @@ -1,41 +1,167 @@ package com.casic.dcms.widgets; +import android.annotation.SuppressLint; +import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; +import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import com.bumptech.glide.Glide; import com.casic.dcms.R; -import com.qmuiteam.qmui.widget.QMUIRadiusImageView; +import com.luck.picture.lib.photoview.PhotoView; +import com.qmuiteam.qmui.util.QMUIDisplayHelper; -/** - * @author : Pengxh - * @time : 2021/4/13 16:32 - * @email : 290677893@qq.com - **/ -public class BigPictureDialog extends DialogFragment { +import org.jetbrains.annotations.NotNull; - private static final String TAG = "BigPictureDialog"; - private View mRootView; +import java.util.List; - @Nullable +public class BigPictureDialog extends AlertDialog { + + private Context context; + private int index; + private List data; + private TextView pageNumberView; + private ViewPager imagePagerView; + private Window window; + + private BigPictureDialog(Builder builder) { + super(builder.mContext, R.style.CustomDialogStyle); + this.context = builder.mContext; + this.index = builder.index; + this.data = builder.images; + } + @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); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.dialog_big_picture); + + pageNumberView = findViewById(R.id.pageNumberView); + imagePagerView = findViewById(R.id.imagePagerView); + initData(); + window = getWindow(); + + setCancelable(true); + setCanceledOnTouchOutside(true); + } + + @Override + public void onAttachedToWindow() { + super.onAttachedToWindow(); + WindowManager.LayoutParams layoutParams = window.getAttributes(); + layoutParams.width = (int) (QMUIDisplayHelper.getScreenWidth(context) * 0.9); + layoutParams.height = (int) (QMUIDisplayHelper.getScreenHeight(context) * 0.65); + window.setAttributes(layoutParams); + } + + private void initData() { + imagePagerView.setAdapter(new BigPictureAdapter()); + imagePagerView.setCurrentItem(index); + imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 + imagePagerView.setPageMargin(10);//控制两幅图之间的间距 + imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + + } + + @SuppressLint("SetTextI18n") + @Override + public void onPageSelected(int position) { + pageNumberView.setText("(" + (position + 1) + "/" + data.size() + ")"); + } + + @Override + public void onPageScrollStateChanged(int state) { + + } + }); + } + + class BigPictureAdapter extends PagerAdapter { + + @Override + public int getCount() { + return data.size(); } - 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); + + @Override + public boolean isViewFromObject(@NotNull View view, @NotNull Object object) { + return view == object; } - return mRootView; + + @NotNull + @Override + public Object instantiateItem(@NotNull ViewGroup container, int position) { + View view = LayoutInflater.from(context).inflate(R.layout.item_big_picture, container, false); + PhotoView photoView = view.findViewById(R.id.photoView); + Glide.with(context).load(data.get(position)).into(photoView); + container.addView(view); + return view; + } + + @Override + public void destroyItem(ViewGroup container, int position, @NotNull Object object) { + container.removeView((View) object); + } + } + + //设置切换动画 + public static class ZoomOutPageTransformer implements ViewPager.PageTransformer { + //自由控制缩放比例 + private static final float MAX_SCALE = 1f; + private static final float MIN_SCALE = 0.85f;//0.85f + + @Override + public void transformPage(@NotNull View page, float position) { + + if (position <= 1) { + float scaleFactor = MIN_SCALE + (1 - Math.abs(position)) * (MAX_SCALE - MIN_SCALE); + page.setScaleX(scaleFactor); + if (position > 0) { + page.setTranslationX(-scaleFactor * 2); + } else if (position < 0) { + page.setTranslationX(scaleFactor * 2); + } + page.setScaleY(scaleFactor); + } else { + page.setScaleX(MIN_SCALE); + page.setScaleY(MIN_SCALE); + } + } + } + + public static class Builder { + private Context mContext; + private int index; + private List images; + + public Builder setContext(Context mContext) { + this.mContext = mContext; + return this; + } + + public Builder setImageIndex(int imageIndex) { + this.index = imageIndex; + return this; + } + + public Builder setImageList(List images) { + this.images = images; + return this; + } + + public BigPictureDialog build() { + return new BigPictureDialog(this); + } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 0dcdd9b..41800f2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -229,7 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -465,6 +465,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { if (largeClassBean.isSuccess()) { //设置大类数据 @@ -620,7 +625,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 93120d6..0f065e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -114,4 +114,9 @@ finish(); } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 8ccc0ca..e5bdf09 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -210,14 +210,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -250,6 +256,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainUploadAudioResult(ActionResultBean resultBean) { } @@ -274,7 +285,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 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 d209555..542a90e 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -3,7 +3,6 @@ import android.content.Intent; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -23,7 +22,6 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; import com.casic.dcms.widgets.InputDialog; -import com.google.gson.Gson; import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -193,6 +191,11 @@ } @Override + public void loginFail() { + ToastHelper.showToast("登录失败，请检查账号密码", ToastHelper.ERROR); + } + + @Override public void hideProgress() { loadingDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index 7b095fb..78880dc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -30,6 +30,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -147,6 +148,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息超时", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index d82b56b..154d77d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -141,6 +141,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (loginOutPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index d0e0ec6..62b84dd 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -3,15 +3,15 @@ import android.content.Context; import android.content.Intent; -import com.casic.dcms.ui.BigPictureActivity; import com.casic.dcms.ui.CaseProcessActivity; +import com.casic.dcms.widgets.BigPictureDialog; + +import java.util.List; public class OtherUtils { //查看大图 - public static void showBigImage(Context context, String imagePath) { - Intent intent = new Intent(context, BigPictureActivity.class); - intent.putExtra("path", imagePath); - context.startActivity(intent); + public static void showBigImage(Context context, int index, List imageList) { + new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); } //查看案卷处理记录 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 0412275..9cdf5a1 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 @@ -1,7 +1,5 @@ package com.casic.dcms.utils.retrofit; -import android.util.Log; - import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseCheckedBean; @@ -65,7 +63,7 @@ HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() { @Override public void log(@NotNull String message) { - Log.d(TAG, "log: " + message); +// Log.d(TAG, "log: " + message); } }); interceptor.setLevel(HttpLoggingInterceptor.Level.BODY); diff --git a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java index 2a358c0..3e6ed4e 100644 --- a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java @@ -1,41 +1,167 @@ package com.casic.dcms.widgets; +import android.annotation.SuppressLint; +import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; +import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import com.bumptech.glide.Glide; import com.casic.dcms.R; -import com.qmuiteam.qmui.widget.QMUIRadiusImageView; +import com.luck.picture.lib.photoview.PhotoView; +import com.qmuiteam.qmui.util.QMUIDisplayHelper; -/** - * @author : Pengxh - * @time : 2021/4/13 16:32 - * @email : 290677893@qq.com - **/ -public class BigPictureDialog extends DialogFragment { +import org.jetbrains.annotations.NotNull; - private static final String TAG = "BigPictureDialog"; - private View mRootView; +import java.util.List; - @Nullable +public class BigPictureDialog extends AlertDialog { + + private Context context; + private int index; + private List data; + private TextView pageNumberView; + private ViewPager imagePagerView; + private Window window; + + private BigPictureDialog(Builder builder) { + super(builder.mContext, R.style.CustomDialogStyle); + this.context = builder.mContext; + this.index = builder.index; + this.data = builder.images; + } + @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); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.dialog_big_picture); + + pageNumberView = findViewById(R.id.pageNumberView); + imagePagerView = findViewById(R.id.imagePagerView); + initData(); + window = getWindow(); + + setCancelable(true); + setCanceledOnTouchOutside(true); + } + + @Override + public void onAttachedToWindow() { + super.onAttachedToWindow(); + WindowManager.LayoutParams layoutParams = window.getAttributes(); + layoutParams.width = (int) (QMUIDisplayHelper.getScreenWidth(context) * 0.9); + layoutParams.height = (int) (QMUIDisplayHelper.getScreenHeight(context) * 0.65); + window.setAttributes(layoutParams); + } + + private void initData() { + imagePagerView.setAdapter(new BigPictureAdapter()); + imagePagerView.setCurrentItem(index); + imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 + imagePagerView.setPageMargin(10);//控制两幅图之间的间距 + imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + + } + + @SuppressLint("SetTextI18n") + @Override + public void onPageSelected(int position) { + pageNumberView.setText("(" + (position + 1) + "/" + data.size() + ")"); + } + + @Override + public void onPageScrollStateChanged(int state) { + + } + }); + } + + class BigPictureAdapter extends PagerAdapter { + + @Override + public int getCount() { + return data.size(); } - 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); + + @Override + public boolean isViewFromObject(@NotNull View view, @NotNull Object object) { + return view == object; } - return mRootView; + + @NotNull + @Override + public Object instantiateItem(@NotNull ViewGroup container, int position) { + View view = LayoutInflater.from(context).inflate(R.layout.item_big_picture, container, false); + PhotoView photoView = view.findViewById(R.id.photoView); + Glide.with(context).load(data.get(position)).into(photoView); + container.addView(view); + return view; + } + + @Override + public void destroyItem(ViewGroup container, int position, @NotNull Object object) { + container.removeView((View) object); + } + } + + //设置切换动画 + public static class ZoomOutPageTransformer implements ViewPager.PageTransformer { + //自由控制缩放比例 + private static final float MAX_SCALE = 1f; + private static final float MIN_SCALE = 0.85f;//0.85f + + @Override + public void transformPage(@NotNull View page, float position) { + + if (position <= 1) { + float scaleFactor = MIN_SCALE + (1 - Math.abs(position)) * (MAX_SCALE - MIN_SCALE); + page.setScaleX(scaleFactor); + if (position > 0) { + page.setTranslationX(-scaleFactor * 2); + } else if (position < 0) { + page.setTranslationX(scaleFactor * 2); + } + page.setScaleY(scaleFactor); + } else { + page.setScaleX(MIN_SCALE); + page.setScaleY(MIN_SCALE); + } + } + } + + public static class Builder { + private Context mContext; + private int index; + private List images; + + public Builder setContext(Context mContext) { + this.mContext = mContext; + return this; + } + + public Builder setImageIndex(int imageIndex) { + this.index = imageIndex; + return this; + } + + public Builder setImageList(List images) { + this.images = images; + return this; + } + + public BigPictureDialog build() { + return new BigPictureDialog(this); + } } } diff --git a/app/src/main/res/layout/activity_big_pic.xml b/app/src/main/res/layout/activity_big_pic.xml deleted file mode 100644 index bc09ace..0000000 --- a/app/src/main/res/layout/activity_big_pic.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 0dcdd9b..41800f2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -229,7 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -465,6 +465,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { if (largeClassBean.isSuccess()) { //设置大类数据 @@ -620,7 +625,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 93120d6..0f065e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -114,4 +114,9 @@ finish(); } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 8ccc0ca..e5bdf09 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -210,14 +210,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -250,6 +256,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainUploadAudioResult(ActionResultBean resultBean) { } @@ -274,7 +285,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 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 d209555..542a90e 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -3,7 +3,6 @@ import android.content.Intent; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -23,7 +22,6 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; import com.casic.dcms.widgets.InputDialog; -import com.google.gson.Gson; import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -193,6 +191,11 @@ } @Override + public void loginFail() { + ToastHelper.showToast("登录失败，请检查账号密码", ToastHelper.ERROR); + } + + @Override public void hideProgress() { loadingDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index 7b095fb..78880dc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -30,6 +30,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -147,6 +148,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息超时", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index d82b56b..154d77d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -141,6 +141,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (loginOutPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index d0e0ec6..62b84dd 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -3,15 +3,15 @@ import android.content.Context; import android.content.Intent; -import com.casic.dcms.ui.BigPictureActivity; import com.casic.dcms.ui.CaseProcessActivity; +import com.casic.dcms.widgets.BigPictureDialog; + +import java.util.List; public class OtherUtils { //查看大图 - public static void showBigImage(Context context, String imagePath) { - Intent intent = new Intent(context, BigPictureActivity.class); - intent.putExtra("path", imagePath); - context.startActivity(intent); + public static void showBigImage(Context context, int index, List imageList) { + new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); } //查看案卷处理记录 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 0412275..9cdf5a1 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 @@ -1,7 +1,5 @@ package com.casic.dcms.utils.retrofit; -import android.util.Log; - import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseCheckedBean; @@ -65,7 +63,7 @@ HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() { @Override public void log(@NotNull String message) { - Log.d(TAG, "log: " + message); +// Log.d(TAG, "log: " + message); } }); interceptor.setLevel(HttpLoggingInterceptor.Level.BODY); diff --git a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java index 2a358c0..3e6ed4e 100644 --- a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java @@ -1,41 +1,167 @@ package com.casic.dcms.widgets; +import android.annotation.SuppressLint; +import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; +import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import com.bumptech.glide.Glide; import com.casic.dcms.R; -import com.qmuiteam.qmui.widget.QMUIRadiusImageView; +import com.luck.picture.lib.photoview.PhotoView; +import com.qmuiteam.qmui.util.QMUIDisplayHelper; -/** - * @author : Pengxh - * @time : 2021/4/13 16:32 - * @email : 290677893@qq.com - **/ -public class BigPictureDialog extends DialogFragment { +import org.jetbrains.annotations.NotNull; - private static final String TAG = "BigPictureDialog"; - private View mRootView; +import java.util.List; - @Nullable +public class BigPictureDialog extends AlertDialog { + + private Context context; + private int index; + private List data; + private TextView pageNumberView; + private ViewPager imagePagerView; + private Window window; + + private BigPictureDialog(Builder builder) { + super(builder.mContext, R.style.CustomDialogStyle); + this.context = builder.mContext; + this.index = builder.index; + this.data = builder.images; + } + @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); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.dialog_big_picture); + + pageNumberView = findViewById(R.id.pageNumberView); + imagePagerView = findViewById(R.id.imagePagerView); + initData(); + window = getWindow(); + + setCancelable(true); + setCanceledOnTouchOutside(true); + } + + @Override + public void onAttachedToWindow() { + super.onAttachedToWindow(); + WindowManager.LayoutParams layoutParams = window.getAttributes(); + layoutParams.width = (int) (QMUIDisplayHelper.getScreenWidth(context) * 0.9); + layoutParams.height = (int) (QMUIDisplayHelper.getScreenHeight(context) * 0.65); + window.setAttributes(layoutParams); + } + + private void initData() { + imagePagerView.setAdapter(new BigPictureAdapter()); + imagePagerView.setCurrentItem(index); + imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 + imagePagerView.setPageMargin(10);//控制两幅图之间的间距 + imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + + } + + @SuppressLint("SetTextI18n") + @Override + public void onPageSelected(int position) { + pageNumberView.setText("(" + (position + 1) + "/" + data.size() + ")"); + } + + @Override + public void onPageScrollStateChanged(int state) { + + } + }); + } + + class BigPictureAdapter extends PagerAdapter { + + @Override + public int getCount() { + return data.size(); } - 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); + + @Override + public boolean isViewFromObject(@NotNull View view, @NotNull Object object) { + return view == object; } - return mRootView; + + @NotNull + @Override + public Object instantiateItem(@NotNull ViewGroup container, int position) { + View view = LayoutInflater.from(context).inflate(R.layout.item_big_picture, container, false); + PhotoView photoView = view.findViewById(R.id.photoView); + Glide.with(context).load(data.get(position)).into(photoView); + container.addView(view); + return view; + } + + @Override + public void destroyItem(ViewGroup container, int position, @NotNull Object object) { + container.removeView((View) object); + } + } + + //设置切换动画 + public static class ZoomOutPageTransformer implements ViewPager.PageTransformer { + //自由控制缩放比例 + private static final float MAX_SCALE = 1f; + private static final float MIN_SCALE = 0.85f;//0.85f + + @Override + public void transformPage(@NotNull View page, float position) { + + if (position <= 1) { + float scaleFactor = MIN_SCALE + (1 - Math.abs(position)) * (MAX_SCALE - MIN_SCALE); + page.setScaleX(scaleFactor); + if (position > 0) { + page.setTranslationX(-scaleFactor * 2); + } else if (position < 0) { + page.setTranslationX(scaleFactor * 2); + } + page.setScaleY(scaleFactor); + } else { + page.setScaleX(MIN_SCALE); + page.setScaleY(MIN_SCALE); + } + } + } + + public static class Builder { + private Context mContext; + private int index; + private List images; + + public Builder setContext(Context mContext) { + this.mContext = mContext; + return this; + } + + public Builder setImageIndex(int imageIndex) { + this.index = imageIndex; + return this; + } + + public Builder setImageList(List images) { + this.images = images; + return this; + } + + public BigPictureDialog build() { + return new BigPictureDialog(this); + } } } diff --git a/app/src/main/res/layout/activity_big_pic.xml b/app/src/main/res/layout/activity_big_pic.xml deleted file mode 100644 index bc09ace..0000000 --- a/app/src/main/res/layout/activity_big_pic.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 104eb8d..adb7b93 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -201,22 +201,10 @@ android:textSize="@dimen/textFontSize" /> - - + android:layout_toEndOf="@id/vv" /> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 0dcdd9b..41800f2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -229,7 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -465,6 +465,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { if (largeClassBean.isSuccess()) { //设置大类数据 @@ -620,7 +625,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 93120d6..0f065e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -114,4 +114,9 @@ finish(); } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 8ccc0ca..e5bdf09 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -210,14 +210,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -250,6 +256,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainUploadAudioResult(ActionResultBean resultBean) { } @@ -274,7 +285,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 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 d209555..542a90e 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -3,7 +3,6 @@ import android.content.Intent; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -23,7 +22,6 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; import com.casic.dcms.widgets.InputDialog; -import com.google.gson.Gson; import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -193,6 +191,11 @@ } @Override + public void loginFail() { + ToastHelper.showToast("登录失败，请检查账号密码", ToastHelper.ERROR); + } + + @Override public void hideProgress() { loadingDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index 7b095fb..78880dc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -30,6 +30,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -147,6 +148,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息超时", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index d82b56b..154d77d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -141,6 +141,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (loginOutPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index d0e0ec6..62b84dd 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -3,15 +3,15 @@ import android.content.Context; import android.content.Intent; -import com.casic.dcms.ui.BigPictureActivity; import com.casic.dcms.ui.CaseProcessActivity; +import com.casic.dcms.widgets.BigPictureDialog; + +import java.util.List; public class OtherUtils { //查看大图 - public static void showBigImage(Context context, String imagePath) { - Intent intent = new Intent(context, BigPictureActivity.class); - intent.putExtra("path", imagePath); - context.startActivity(intent); + public static void showBigImage(Context context, int index, List imageList) { + new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); } //查看案卷处理记录 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 0412275..9cdf5a1 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 @@ -1,7 +1,5 @@ package com.casic.dcms.utils.retrofit; -import android.util.Log; - import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseCheckedBean; @@ -65,7 +63,7 @@ HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() { @Override public void log(@NotNull String message) { - Log.d(TAG, "log: " + message); +// Log.d(TAG, "log: " + message); } }); interceptor.setLevel(HttpLoggingInterceptor.Level.BODY); diff --git a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java index 2a358c0..3e6ed4e 100644 --- a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java @@ -1,41 +1,167 @@ package com.casic.dcms.widgets; +import android.annotation.SuppressLint; +import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; +import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import com.bumptech.glide.Glide; import com.casic.dcms.R; -import com.qmuiteam.qmui.widget.QMUIRadiusImageView; +import com.luck.picture.lib.photoview.PhotoView; +import com.qmuiteam.qmui.util.QMUIDisplayHelper; -/** - * @author : Pengxh - * @time : 2021/4/13 16:32 - * @email : 290677893@qq.com - **/ -public class BigPictureDialog extends DialogFragment { +import org.jetbrains.annotations.NotNull; - private static final String TAG = "BigPictureDialog"; - private View mRootView; +import java.util.List; - @Nullable +public class BigPictureDialog extends AlertDialog { + + private Context context; + private int index; + private List data; + private TextView pageNumberView; + private ViewPager imagePagerView; + private Window window; + + private BigPictureDialog(Builder builder) { + super(builder.mContext, R.style.CustomDialogStyle); + this.context = builder.mContext; + this.index = builder.index; + this.data = builder.images; + } + @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); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.dialog_big_picture); + + pageNumberView = findViewById(R.id.pageNumberView); + imagePagerView = findViewById(R.id.imagePagerView); + initData(); + window = getWindow(); + + setCancelable(true); + setCanceledOnTouchOutside(true); + } + + @Override + public void onAttachedToWindow() { + super.onAttachedToWindow(); + WindowManager.LayoutParams layoutParams = window.getAttributes(); + layoutParams.width = (int) (QMUIDisplayHelper.getScreenWidth(context) * 0.9); + layoutParams.height = (int) (QMUIDisplayHelper.getScreenHeight(context) * 0.65); + window.setAttributes(layoutParams); + } + + private void initData() { + imagePagerView.setAdapter(new BigPictureAdapter()); + imagePagerView.setCurrentItem(index); + imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 + imagePagerView.setPageMargin(10);//控制两幅图之间的间距 + imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + + } + + @SuppressLint("SetTextI18n") + @Override + public void onPageSelected(int position) { + pageNumberView.setText("(" + (position + 1) + "/" + data.size() + ")"); + } + + @Override + public void onPageScrollStateChanged(int state) { + + } + }); + } + + class BigPictureAdapter extends PagerAdapter { + + @Override + public int getCount() { + return data.size(); } - 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); + + @Override + public boolean isViewFromObject(@NotNull View view, @NotNull Object object) { + return view == object; } - return mRootView; + + @NotNull + @Override + public Object instantiateItem(@NotNull ViewGroup container, int position) { + View view = LayoutInflater.from(context).inflate(R.layout.item_big_picture, container, false); + PhotoView photoView = view.findViewById(R.id.photoView); + Glide.with(context).load(data.get(position)).into(photoView); + container.addView(view); + return view; + } + + @Override + public void destroyItem(ViewGroup container, int position, @NotNull Object object) { + container.removeView((View) object); + } + } + + //设置切换动画 + public static class ZoomOutPageTransformer implements ViewPager.PageTransformer { + //自由控制缩放比例 + private static final float MAX_SCALE = 1f; + private static final float MIN_SCALE = 0.85f;//0.85f + + @Override + public void transformPage(@NotNull View page, float position) { + + if (position <= 1) { + float scaleFactor = MIN_SCALE + (1 - Math.abs(position)) * (MAX_SCALE - MIN_SCALE); + page.setScaleX(scaleFactor); + if (position > 0) { + page.setTranslationX(-scaleFactor * 2); + } else if (position < 0) { + page.setTranslationX(scaleFactor * 2); + } + page.setScaleY(scaleFactor); + } else { + page.setScaleX(MIN_SCALE); + page.setScaleY(MIN_SCALE); + } + } + } + + public static class Builder { + private Context mContext; + private int index; + private List images; + + public Builder setContext(Context mContext) { + this.mContext = mContext; + return this; + } + + public Builder setImageIndex(int imageIndex) { + this.index = imageIndex; + return this; + } + + public Builder setImageList(List images) { + this.images = images; + return this; + } + + public BigPictureDialog build() { + return new BigPictureDialog(this); + } } } diff --git a/app/src/main/res/layout/activity_big_pic.xml b/app/src/main/res/layout/activity_big_pic.xml deleted file mode 100644 index bc09ace..0000000 --- a/app/src/main/res/layout/activity_big_pic.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 104eb8d..adb7b93 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -201,22 +201,10 @@ android:textSize="@dimen/textFontSize" /> - - + android:layout_toEndOf="@id/vv" /> diff --git a/app/src/main/res/layout/activity_package.xml b/app/src/main/res/layout/activity_package.xml index f64fc21..68f6ea1 100644 --- a/app/src/main/res/layout/activity_package.xml +++ b/app/src/main/res/layout/activity_package.xml @@ -145,6 +145,7 @@ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 0dcdd9b..41800f2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -229,7 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -465,6 +465,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { if (largeClassBean.isSuccess()) { //设置大类数据 @@ -620,7 +625,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 93120d6..0f065e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -114,4 +114,9 @@ finish(); } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 8ccc0ca..e5bdf09 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -210,14 +210,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -250,6 +256,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainUploadAudioResult(ActionResultBean resultBean) { } @@ -274,7 +285,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 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 d209555..542a90e 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -3,7 +3,6 @@ import android.content.Intent; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -23,7 +22,6 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; import com.casic.dcms.widgets.InputDialog; -import com.google.gson.Gson; import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -193,6 +191,11 @@ } @Override + public void loginFail() { + ToastHelper.showToast("登录失败，请检查账号密码", ToastHelper.ERROR); + } + + @Override public void hideProgress() { loadingDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index 7b095fb..78880dc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -30,6 +30,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -147,6 +148,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息超时", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index d82b56b..154d77d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -141,6 +141,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (loginOutPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index d0e0ec6..62b84dd 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -3,15 +3,15 @@ import android.content.Context; import android.content.Intent; -import com.casic.dcms.ui.BigPictureActivity; import com.casic.dcms.ui.CaseProcessActivity; +import com.casic.dcms.widgets.BigPictureDialog; + +import java.util.List; public class OtherUtils { //查看大图 - public static void showBigImage(Context context, String imagePath) { - Intent intent = new Intent(context, BigPictureActivity.class); - intent.putExtra("path", imagePath); - context.startActivity(intent); + public static void showBigImage(Context context, int index, List imageList) { + new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); } //查看案卷处理记录 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 0412275..9cdf5a1 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 @@ -1,7 +1,5 @@ package com.casic.dcms.utils.retrofit; -import android.util.Log; - import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseCheckedBean; @@ -65,7 +63,7 @@ HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() { @Override public void log(@NotNull String message) { - Log.d(TAG, "log: " + message); +// Log.d(TAG, "log: " + message); } }); interceptor.setLevel(HttpLoggingInterceptor.Level.BODY); diff --git a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java index 2a358c0..3e6ed4e 100644 --- a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java @@ -1,41 +1,167 @@ package com.casic.dcms.widgets; +import android.annotation.SuppressLint; +import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; +import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import com.bumptech.glide.Glide; import com.casic.dcms.R; -import com.qmuiteam.qmui.widget.QMUIRadiusImageView; +import com.luck.picture.lib.photoview.PhotoView; +import com.qmuiteam.qmui.util.QMUIDisplayHelper; -/** - * @author : Pengxh - * @time : 2021/4/13 16:32 - * @email : 290677893@qq.com - **/ -public class BigPictureDialog extends DialogFragment { +import org.jetbrains.annotations.NotNull; - private static final String TAG = "BigPictureDialog"; - private View mRootView; +import java.util.List; - @Nullable +public class BigPictureDialog extends AlertDialog { + + private Context context; + private int index; + private List data; + private TextView pageNumberView; + private ViewPager imagePagerView; + private Window window; + + private BigPictureDialog(Builder builder) { + super(builder.mContext, R.style.CustomDialogStyle); + this.context = builder.mContext; + this.index = builder.index; + this.data = builder.images; + } + @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); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.dialog_big_picture); + + pageNumberView = findViewById(R.id.pageNumberView); + imagePagerView = findViewById(R.id.imagePagerView); + initData(); + window = getWindow(); + + setCancelable(true); + setCanceledOnTouchOutside(true); + } + + @Override + public void onAttachedToWindow() { + super.onAttachedToWindow(); + WindowManager.LayoutParams layoutParams = window.getAttributes(); + layoutParams.width = (int) (QMUIDisplayHelper.getScreenWidth(context) * 0.9); + layoutParams.height = (int) (QMUIDisplayHelper.getScreenHeight(context) * 0.65); + window.setAttributes(layoutParams); + } + + private void initData() { + imagePagerView.setAdapter(new BigPictureAdapter()); + imagePagerView.setCurrentItem(index); + imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 + imagePagerView.setPageMargin(10);//控制两幅图之间的间距 + imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + + } + + @SuppressLint("SetTextI18n") + @Override + public void onPageSelected(int position) { + pageNumberView.setText("(" + (position + 1) + "/" + data.size() + ")"); + } + + @Override + public void onPageScrollStateChanged(int state) { + + } + }); + } + + class BigPictureAdapter extends PagerAdapter { + + @Override + public int getCount() { + return data.size(); } - 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); + + @Override + public boolean isViewFromObject(@NotNull View view, @NotNull Object object) { + return view == object; } - return mRootView; + + @NotNull + @Override + public Object instantiateItem(@NotNull ViewGroup container, int position) { + View view = LayoutInflater.from(context).inflate(R.layout.item_big_picture, container, false); + PhotoView photoView = view.findViewById(R.id.photoView); + Glide.with(context).load(data.get(position)).into(photoView); + container.addView(view); + return view; + } + + @Override + public void destroyItem(ViewGroup container, int position, @NotNull Object object) { + container.removeView((View) object); + } + } + + //设置切换动画 + public static class ZoomOutPageTransformer implements ViewPager.PageTransformer { + //自由控制缩放比例 + private static final float MAX_SCALE = 1f; + private static final float MIN_SCALE = 0.85f;//0.85f + + @Override + public void transformPage(@NotNull View page, float position) { + + if (position <= 1) { + float scaleFactor = MIN_SCALE + (1 - Math.abs(position)) * (MAX_SCALE - MIN_SCALE); + page.setScaleX(scaleFactor); + if (position > 0) { + page.setTranslationX(-scaleFactor * 2); + } else if (position < 0) { + page.setTranslationX(scaleFactor * 2); + } + page.setScaleY(scaleFactor); + } else { + page.setScaleX(MIN_SCALE); + page.setScaleY(MIN_SCALE); + } + } + } + + public static class Builder { + private Context mContext; + private int index; + private List images; + + public Builder setContext(Context mContext) { + this.mContext = mContext; + return this; + } + + public Builder setImageIndex(int imageIndex) { + this.index = imageIndex; + return this; + } + + public Builder setImageList(List images) { + this.images = images; + return this; + } + + public BigPictureDialog build() { + return new BigPictureDialog(this); + } } } diff --git a/app/src/main/res/layout/activity_big_pic.xml b/app/src/main/res/layout/activity_big_pic.xml deleted file mode 100644 index bc09ace..0000000 --- a/app/src/main/res/layout/activity_big_pic.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 104eb8d..adb7b93 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -201,22 +201,10 @@ android:textSize="@dimen/textFontSize" /> - - + android:layout_toEndOf="@id/vv" /> diff --git a/app/src/main/res/layout/activity_package.xml b/app/src/main/res/layout/activity_package.xml index f64fc21..68f6ea1 100644 --- a/app/src/main/res/layout/activity_package.xml +++ b/app/src/main/res/layout/activity_package.xml @@ -145,6 +145,7 @@ diff --git a/app/src/main/res/layout/dialog_big_picture.xml b/app/src/main/res/layout/dialog_big_picture.xml index 42a4438..dce0b9d 100644 --- a/app/src/main/res/layout/dialog_big_picture.xml +++ b/app/src/main/res/layout/dialog_big_picture.xml @@ -1,13 +1,54 @@ - + android:id="@+id/cardViewLayout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:cardCornerRadius="5dp"> - - \ No newline at end of file + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:layout_margin="5dp" + android:background="@color/white" + android:orientation="vertical" + android:paddingHorizontal="5dp"> + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 0dcdd9b..41800f2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -229,7 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -465,6 +465,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { if (largeClassBean.isSuccess()) { //设置大类数据 @@ -620,7 +625,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 93120d6..0f065e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -114,4 +114,9 @@ finish(); } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 8ccc0ca..e5bdf09 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -210,14 +210,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -250,6 +256,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainUploadAudioResult(ActionResultBean resultBean) { } @@ -274,7 +285,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 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 d209555..542a90e 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -3,7 +3,6 @@ import android.content.Intent; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -23,7 +22,6 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; import com.casic.dcms.widgets.InputDialog; -import com.google.gson.Gson; import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -193,6 +191,11 @@ } @Override + public void loginFail() { + ToastHelper.showToast("登录失败，请检查账号密码", ToastHelper.ERROR); + } + + @Override public void hideProgress() { loadingDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index 7b095fb..78880dc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -30,6 +30,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -147,6 +148,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息超时", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index d82b56b..154d77d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -141,6 +141,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (loginOutPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index d0e0ec6..62b84dd 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -3,15 +3,15 @@ import android.content.Context; import android.content.Intent; -import com.casic.dcms.ui.BigPictureActivity; import com.casic.dcms.ui.CaseProcessActivity; +import com.casic.dcms.widgets.BigPictureDialog; + +import java.util.List; public class OtherUtils { //查看大图 - public static void showBigImage(Context context, String imagePath) { - Intent intent = new Intent(context, BigPictureActivity.class); - intent.putExtra("path", imagePath); - context.startActivity(intent); + public static void showBigImage(Context context, int index, List imageList) { + new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); } //查看案卷处理记录 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 0412275..9cdf5a1 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 @@ -1,7 +1,5 @@ package com.casic.dcms.utils.retrofit; -import android.util.Log; - import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseCheckedBean; @@ -65,7 +63,7 @@ HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() { @Override public void log(@NotNull String message) { - Log.d(TAG, "log: " + message); +// Log.d(TAG, "log: " + message); } }); interceptor.setLevel(HttpLoggingInterceptor.Level.BODY); diff --git a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java index 2a358c0..3e6ed4e 100644 --- a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java @@ -1,41 +1,167 @@ package com.casic.dcms.widgets; +import android.annotation.SuppressLint; +import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; +import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import com.bumptech.glide.Glide; import com.casic.dcms.R; -import com.qmuiteam.qmui.widget.QMUIRadiusImageView; +import com.luck.picture.lib.photoview.PhotoView; +import com.qmuiteam.qmui.util.QMUIDisplayHelper; -/** - * @author : Pengxh - * @time : 2021/4/13 16:32 - * @email : 290677893@qq.com - **/ -public class BigPictureDialog extends DialogFragment { +import org.jetbrains.annotations.NotNull; - private static final String TAG = "BigPictureDialog"; - private View mRootView; +import java.util.List; - @Nullable +public class BigPictureDialog extends AlertDialog { + + private Context context; + private int index; + private List data; + private TextView pageNumberView; + private ViewPager imagePagerView; + private Window window; + + private BigPictureDialog(Builder builder) { + super(builder.mContext, R.style.CustomDialogStyle); + this.context = builder.mContext; + this.index = builder.index; + this.data = builder.images; + } + @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); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.dialog_big_picture); + + pageNumberView = findViewById(R.id.pageNumberView); + imagePagerView = findViewById(R.id.imagePagerView); + initData(); + window = getWindow(); + + setCancelable(true); + setCanceledOnTouchOutside(true); + } + + @Override + public void onAttachedToWindow() { + super.onAttachedToWindow(); + WindowManager.LayoutParams layoutParams = window.getAttributes(); + layoutParams.width = (int) (QMUIDisplayHelper.getScreenWidth(context) * 0.9); + layoutParams.height = (int) (QMUIDisplayHelper.getScreenHeight(context) * 0.65); + window.setAttributes(layoutParams); + } + + private void initData() { + imagePagerView.setAdapter(new BigPictureAdapter()); + imagePagerView.setCurrentItem(index); + imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 + imagePagerView.setPageMargin(10);//控制两幅图之间的间距 + imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + + } + + @SuppressLint("SetTextI18n") + @Override + public void onPageSelected(int position) { + pageNumberView.setText("(" + (position + 1) + "/" + data.size() + ")"); + } + + @Override + public void onPageScrollStateChanged(int state) { + + } + }); + } + + class BigPictureAdapter extends PagerAdapter { + + @Override + public int getCount() { + return data.size(); } - 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); + + @Override + public boolean isViewFromObject(@NotNull View view, @NotNull Object object) { + return view == object; } - return mRootView; + + @NotNull + @Override + public Object instantiateItem(@NotNull ViewGroup container, int position) { + View view = LayoutInflater.from(context).inflate(R.layout.item_big_picture, container, false); + PhotoView photoView = view.findViewById(R.id.photoView); + Glide.with(context).load(data.get(position)).into(photoView); + container.addView(view); + return view; + } + + @Override + public void destroyItem(ViewGroup container, int position, @NotNull Object object) { + container.removeView((View) object); + } + } + + //设置切换动画 + public static class ZoomOutPageTransformer implements ViewPager.PageTransformer { + //自由控制缩放比例 + private static final float MAX_SCALE = 1f; + private static final float MIN_SCALE = 0.85f;//0.85f + + @Override + public void transformPage(@NotNull View page, float position) { + + if (position <= 1) { + float scaleFactor = MIN_SCALE + (1 - Math.abs(position)) * (MAX_SCALE - MIN_SCALE); + page.setScaleX(scaleFactor); + if (position > 0) { + page.setTranslationX(-scaleFactor * 2); + } else if (position < 0) { + page.setTranslationX(scaleFactor * 2); + } + page.setScaleY(scaleFactor); + } else { + page.setScaleX(MIN_SCALE); + page.setScaleY(MIN_SCALE); + } + } + } + + public static class Builder { + private Context mContext; + private int index; + private List images; + + public Builder setContext(Context mContext) { + this.mContext = mContext; + return this; + } + + public Builder setImageIndex(int imageIndex) { + this.index = imageIndex; + return this; + } + + public Builder setImageList(List images) { + this.images = images; + return this; + } + + public BigPictureDialog build() { + return new BigPictureDialog(this); + } } } diff --git a/app/src/main/res/layout/activity_big_pic.xml b/app/src/main/res/layout/activity_big_pic.xml deleted file mode 100644 index bc09ace..0000000 --- a/app/src/main/res/layout/activity_big_pic.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 104eb8d..adb7b93 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -201,22 +201,10 @@ android:textSize="@dimen/textFontSize" /> - - + android:layout_toEndOf="@id/vv" /> diff --git a/app/src/main/res/layout/activity_package.xml b/app/src/main/res/layout/activity_package.xml index f64fc21..68f6ea1 100644 --- a/app/src/main/res/layout/activity_package.xml +++ b/app/src/main/res/layout/activity_package.xml @@ -145,6 +145,7 @@ diff --git a/app/src/main/res/layout/dialog_big_picture.xml b/app/src/main/res/layout/dialog_big_picture.xml index 42a4438..dce0b9d 100644 --- a/app/src/main/res/layout/dialog_big_picture.xml +++ b/app/src/main/res/layout/dialog_big_picture.xml @@ -1,13 +1,54 @@ - + android:id="@+id/cardViewLayout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:cardCornerRadius="5dp"> - - \ No newline at end of file + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:layout_margin="5dp" + android:background="@color/white" + android:orientation="vertical" + android:paddingHorizontal="5dp"> + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_big_picture.xml b/app/src/main/res/layout/item_big_picture.xml new file mode 100644 index 0000000..489867f --- /dev/null +++ b/app/src/main/res/layout/item_big_picture.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 670618e..a71ff1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,6 @@ - diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java index 26d5295..387aa12 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseDetailPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java index 34d963b..531e666 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseHandlePresenterImpl.java @@ -56,6 +56,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java index ad4f220..d9343ba 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseProcessPresenterImpl.java @@ -35,5 +35,6 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index ddbb382..cdc3715 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java index 66e1f44..2a85f2d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseUpdateSupervisePresenterImpl.java @@ -31,6 +31,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java index 973931c..eb3387c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ChangePasswordPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java index 86c3aee..f0b156b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginOutPresenterImpl.java @@ -27,7 +27,7 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 88b2489..9b2ac8b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -30,6 +30,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.loginFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index 0bc40fd..feee738 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -41,6 +41,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java index ce672d3..162af1e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UpdatePresenterImpl.java @@ -29,6 +29,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index acd50d0..a23dc42 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index 003217f..d0313e9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java index 1bba479..c913218 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -32,6 +32,7 @@ @Override public void onFailure(Throwable throwable) { view.hideProgress(); + view.obtainDataFail(); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java index 0bcea6a..7fffc21 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UserDataPresenterImpl.java @@ -32,6 +32,6 @@ @Override public void onFailure(Throwable throwable) { - + view.obtainDataFail(); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java index 19faee7..4e94047 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseDetailView.java @@ -4,4 +4,6 @@ public interface ICaseDetailView { void obtainCaseDetailData(CaseDetailBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java index ba4af86..892ea5d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseHandleView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseHandleResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java index f4625e6..d0d7e0b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseProcessView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainCaseProcessData(CaseProcessBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java index 3f98b08..bcca76a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java index 10bcf5a..fcec62f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseUpdateSuperviseView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainUpdateSuperviseData(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java index 2e6e579..f24f585 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IChangePasswordView.java @@ -9,4 +9,6 @@ **/ public interface IChangePasswordView { void obtainChangePassResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java index 5d93830..b7c9216 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginOutView.java @@ -9,4 +9,6 @@ **/ public interface ILoginOutView { void obtainLoginOutResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java index a26046a..7262877 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java @@ -8,4 +8,6 @@ void hideProgress(); void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java index 1711538..749f6b9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUpdateVersionView.java @@ -6,4 +6,6 @@ void hideProgress(); void obtainVersionResult(Object resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java index c69441d..4e90f24 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -12,4 +12,6 @@ void obtainUploadImageResult(ActionResultBean resultBean); void obtainUploadVideoResult(ActionResultBean resultBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java index bcd16a9..fbf1251 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUserDataView.java @@ -4,4 +4,6 @@ public interface IUserDataView { void obtainUserData(UserBean userBean); + + void obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 2501118..7c900b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -94,7 +94,7 @@ gson = new Gson(); weakReferenceHandler = new WeakReferenceHandler(this); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(4000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(1000);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java b/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java deleted file mode 100644 index 9143db8..0000000 --- a/app/src/main/java/com/casic/dcms/ui/BigPictureActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.ui; - -import android.view.View; - -import androidx.core.content.ContextCompat; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseActivity; -import com.luck.picture.lib.photoview.PhotoView; -import com.qmuiteam.qmui.widget.QMUITopBarLayout; - -import butterknife.BindView; - -/** - * @author : Pengxh - * @time : 2021/4/14 17:09 - * @email : 290677893@qq.com - **/ -public class BigPictureActivity extends BaseActivity { - - @BindView(R.id.imageTopLayout) - QMUITopBarLayout imageTopLayout; - @BindView(R.id.photoView) - PhotoView photoView; - - @Override - public int initLayoutView() { - return R.layout.activity_big_pic; - } - - @Override - protected void setupTopBarLayout() { - imageTopLayout.setTitle("查看大图").setTextColor(ContextCompat.getColor(this, R.color.white)); - imageTopLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - imageTopLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void initData() { - String path = getIntent().getStringExtra("path"); - Glide.with(this).load(path).into(photoView); - } - - @Override - public void initEvent() { - - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 5921acc..f7102ad 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -357,7 +357,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -381,7 +381,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -466,7 +466,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -514,6 +514,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("上传失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index fc87ff2..83b3dcc 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -128,7 +129,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -141,6 +142,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index d056d4e..586773f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.RelativeLayout; @@ -16,12 +17,10 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -53,16 +52,13 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicGridView) - RecyclerView casePicGridView; - @BindView(R.id.emptyImageView) - TextView emptyImageView; + @BindView(R.id.casePicRecyclerView) + RecyclerView casePicRecyclerView; @BindView(R.id.handleRecordLayout) RelativeLayout handleRecordLayout; private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private Gson gson; private List urls = new ArrayList<>(); @Override @@ -87,8 +83,6 @@ String id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - - gson = new Gson(); } @Override @@ -109,34 +103,29 @@ caseCommunityView.setText(data.getCommunityName()); casePlaceView.setText(data.getFieldintro()); caseSituationView.setText(data.getDescription()); - List mediaList = gson.fromJson(data.getFileIdVerify(), new TypeToken>() { - }.getType()); - for (String media : mediaList) { - if (media.endsWith("jpeg") || media.endsWith("jpg") || media.endsWith("png")) { - if (media.startsWith("http")) { - urls.add(media); - } else { - urls.add(StringHelper.appendCompleteURL(media)); + + String images = data.getFileIdVerify(); + if (!TextUtils.isEmpty(images)) { + List urls = new ArrayList<>(); + String[] split = images.split(","); + for (String s : split) { + if (s.contains("jpg") || s.contains("jpeg")) { + urls.add(StringHelper.appendCompleteURL(s)); } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicGridView.setVisibility(View.VISIBLE); - casePicGridView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicGridView.addItemDecoration(new ItemDecorationSpace()); - casePicGridView.setAdapter(imageAdapter); - //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); - } - }); - imageAdapter.setDeleteView(false); - } else { - emptyImageView.setVisibility(View.VISIBLE); - emptyImageView.setText("该案卷无图片材料"); - emptyImageView.setText(ColorHelper.getResourcesColor(this, R.color.darkGray)); } + ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); + imageAdapter.setMediaList(urls); + casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); + casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); + casePicRecyclerView.setAdapter(imageAdapter); + //九宫格点击事件 + imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + OtherUtils.showBigImage(context, position, urls); + } + }); + imageAdapter.setDeleteView(false); } } int caseState = data.getCaseState(); @@ -147,6 +136,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 6e8b307..d1376ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -180,7 +180,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -442,7 +442,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -466,6 +466,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainCaseHandleResult(ActionResultBean resultBean) { if (resultBean.isSuccess()) { ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 6309521..46357b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -112,7 +113,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -120,6 +121,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick(R.id.handleLayout) @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java index 2ccb931..a8a4b96 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseProcessActivity.java @@ -17,6 +17,7 @@ import com.casic.dcms.mvp.presenter.CaseProcessPresenterImpl; import com.casic.dcms.mvp.view.ICaseProcessView; import com.casic.dcms.utils.TimeLineDecoration; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -121,6 +122,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷处理记录失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseProcessPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 8b7ca22..f0c8d7c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -156,7 +156,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -208,6 +208,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override protected void onDestroy() { super.onDestroy(); if (caseDetailPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 278e4e9..676a775 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -18,6 +18,7 @@ import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import java.util.ArrayList; @@ -117,7 +118,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -125,6 +126,11 @@ } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } + @OnClick({R.id.caseHandleLayout}) @Override public void onClick(View v) { 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 6a429a4..65f69e2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -549,7 +549,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -591,14 +591,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (!TextUtils.isEmpty(audioUrl)) { mediaList.add(audioUrl); @@ -632,6 +638,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 3ccc444..2ab5a19 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -364,7 +364,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 @@ -392,14 +392,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -425,6 +431,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void hideProgress() { submitDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b1ee400..8e43853 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -139,7 +139,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -239,4 +239,9 @@ mediaPlayer = null; } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 0dcdd9b..41800f2 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -229,7 +229,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, urls.get(position)); + OtherUtils.showBigImage(context, position, urls); } }); imageAdapter.setDeleteView(false); @@ -465,6 +465,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { if (largeClassBean.isSuccess()) { //设置大类数据 @@ -620,7 +625,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index 93120d6..0f065e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -114,4 +114,9 @@ finish(); } } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } } diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 8ccc0ca..e5bdf09 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -210,14 +210,20 @@ private void submitCase() { String longitude = longitudeView.getText().toString(); String latitude = latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } String fieldIntro = caseLocationView.getText().toString(); if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; } String description = caseDetailEditView.getText().toString(); if (TextUtils.isEmpty(description)) { ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; } if (mediaList.size() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); @@ -250,6 +256,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void obtainUploadAudioResult(ActionResultBean resultBean) { } @@ -274,7 +285,7 @@ imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { @Override public void onClick(int position) { - OtherUtils.showBigImage(context, realPaths.get(position)); + OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 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 d209555..542a90e 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -3,7 +3,6 @@ import android.content.Intent; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; @@ -23,7 +22,6 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.TokenHelper; import com.casic.dcms.widgets.InputDialog; -import com.google.gson.Gson; import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton; import com.qmuiteam.qmui.util.QMUIStatusBarHelper; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; @@ -193,6 +191,11 @@ } @Override + public void loginFail() { + ToastHelper.showToast("登录失败，请检查账号密码", ToastHelper.ERROR); + } + + @Override public void hideProgress() { loadingDialog.hide(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index 7b095fb..78880dc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -30,6 +30,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -147,6 +148,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息超时", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index d82b56b..154d77d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -141,6 +141,11 @@ } @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (loginOutPresenter != null) { diff --git a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java index d0e0ec6..62b84dd 100644 --- a/app/src/main/java/com/casic/dcms/utils/OtherUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/OtherUtils.java @@ -3,15 +3,15 @@ import android.content.Context; import android.content.Intent; -import com.casic.dcms.ui.BigPictureActivity; import com.casic.dcms.ui.CaseProcessActivity; +import com.casic.dcms.widgets.BigPictureDialog; + +import java.util.List; public class OtherUtils { //查看大图 - public static void showBigImage(Context context, String imagePath) { - Intent intent = new Intent(context, BigPictureActivity.class); - intent.putExtra("path", imagePath); - context.startActivity(intent); + public static void showBigImage(Context context, int index, List imageList) { + new BigPictureDialog.Builder().setContext(context).setImageIndex(index).setImageList(imageList).build().show(); } //查看案卷处理记录 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 0412275..9cdf5a1 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 @@ -1,7 +1,5 @@ package com.casic.dcms.utils.retrofit; -import android.util.Log; - import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseCheckedBean; @@ -65,7 +63,7 @@ HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() { @Override public void log(@NotNull String message) { - Log.d(TAG, "log: " + message); +// Log.d(TAG, "log: " + message); } }); interceptor.setLevel(HttpLoggingInterceptor.Level.BODY); diff --git a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java index 2a358c0..3e6ed4e 100644 --- a/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/BigPictureDialog.java @@ -1,41 +1,167 @@ package com.casic.dcms.widgets; +import android.annotation.SuppressLint; +import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; +import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import com.bumptech.glide.Glide; import com.casic.dcms.R; -import com.qmuiteam.qmui.widget.QMUIRadiusImageView; +import com.luck.picture.lib.photoview.PhotoView; +import com.qmuiteam.qmui.util.QMUIDisplayHelper; -/** - * @author : Pengxh - * @time : 2021/4/13 16:32 - * @email : 290677893@qq.com - **/ -public class BigPictureDialog extends DialogFragment { +import org.jetbrains.annotations.NotNull; - private static final String TAG = "BigPictureDialog"; - private View mRootView; +import java.util.List; - @Nullable +public class BigPictureDialog extends AlertDialog { + + private Context context; + private int index; + private List data; + private TextView pageNumberView; + private ViewPager imagePagerView; + private Window window; + + private BigPictureDialog(Builder builder) { + super(builder.mContext, R.style.CustomDialogStyle); + this.context = builder.mContext; + this.index = builder.index; + this.data = builder.images; + } + @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); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.dialog_big_picture); + + pageNumberView = findViewById(R.id.pageNumberView); + imagePagerView = findViewById(R.id.imagePagerView); + initData(); + window = getWindow(); + + setCancelable(true); + setCanceledOnTouchOutside(true); + } + + @Override + public void onAttachedToWindow() { + super.onAttachedToWindow(); + WindowManager.LayoutParams layoutParams = window.getAttributes(); + layoutParams.width = (int) (QMUIDisplayHelper.getScreenWidth(context) * 0.9); + layoutParams.height = (int) (QMUIDisplayHelper.getScreenHeight(context) * 0.65); + window.setAttributes(layoutParams); + } + + private void initData() { + imagePagerView.setAdapter(new BigPictureAdapter()); + imagePagerView.setCurrentItem(index); + imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 + imagePagerView.setPageMargin(10);//控制两幅图之间的间距 + imagePagerView.setPageTransformer(true, new ZoomOutPageTransformer()); + imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + + } + + @SuppressLint("SetTextI18n") + @Override + public void onPageSelected(int position) { + pageNumberView.setText("(" + (position + 1) + "/" + data.size() + ")"); + } + + @Override + public void onPageScrollStateChanged(int state) { + + } + }); + } + + class BigPictureAdapter extends PagerAdapter { + + @Override + public int getCount() { + return data.size(); } - 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); + + @Override + public boolean isViewFromObject(@NotNull View view, @NotNull Object object) { + return view == object; } - return mRootView; + + @NotNull + @Override + public Object instantiateItem(@NotNull ViewGroup container, int position) { + View view = LayoutInflater.from(context).inflate(R.layout.item_big_picture, container, false); + PhotoView photoView = view.findViewById(R.id.photoView); + Glide.with(context).load(data.get(position)).into(photoView); + container.addView(view); + return view; + } + + @Override + public void destroyItem(ViewGroup container, int position, @NotNull Object object) { + container.removeView((View) object); + } + } + + //设置切换动画 + public static class ZoomOutPageTransformer implements ViewPager.PageTransformer { + //自由控制缩放比例 + private static final float MAX_SCALE = 1f; + private static final float MIN_SCALE = 0.85f;//0.85f + + @Override + public void transformPage(@NotNull View page, float position) { + + if (position <= 1) { + float scaleFactor = MIN_SCALE + (1 - Math.abs(position)) * (MAX_SCALE - MIN_SCALE); + page.setScaleX(scaleFactor); + if (position > 0) { + page.setTranslationX(-scaleFactor * 2); + } else if (position < 0) { + page.setTranslationX(scaleFactor * 2); + } + page.setScaleY(scaleFactor); + } else { + page.setScaleX(MIN_SCALE); + page.setScaleY(MIN_SCALE); + } + } + } + + public static class Builder { + private Context mContext; + private int index; + private List images; + + public Builder setContext(Context mContext) { + this.mContext = mContext; + return this; + } + + public Builder setImageIndex(int imageIndex) { + this.index = imageIndex; + return this; + } + + public Builder setImageList(List images) { + this.images = images; + return this; + } + + public BigPictureDialog build() { + return new BigPictureDialog(this); + } } } diff --git a/app/src/main/res/layout/activity_big_pic.xml b/app/src/main/res/layout/activity_big_pic.xml deleted file mode 100644 index bc09ace..0000000 --- a/app/src/main/res/layout/activity_big_pic.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 104eb8d..adb7b93 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -201,22 +201,10 @@ android:textSize="@dimen/textFontSize" /> - - + android:layout_toEndOf="@id/vv" /> diff --git a/app/src/main/res/layout/activity_package.xml b/app/src/main/res/layout/activity_package.xml index f64fc21..68f6ea1 100644 --- a/app/src/main/res/layout/activity_package.xml +++ b/app/src/main/res/layout/activity_package.xml @@ -145,6 +145,7 @@ diff --git a/app/src/main/res/layout/dialog_big_picture.xml b/app/src/main/res/layout/dialog_big_picture.xml index 42a4438..dce0b9d 100644 --- a/app/src/main/res/layout/dialog_big_picture.xml +++ b/app/src/main/res/layout/dialog_big_picture.xml @@ -1,13 +1,54 @@ - + android:id="@+id/cardViewLayout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:cardCornerRadius="5dp"> - - \ No newline at end of file + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:layout_margin="5dp" + android:background="@color/white" + android:orientation="vertical" + android:paddingHorizontal="5dp"> + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_big_picture.xml b/app/src/main/res/layout/item_big_picture.xml new file mode 100644 index 0000000..489867f --- /dev/null +++ b/app/src/main/res/layout/item_big_picture.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 6db8b57..02181b6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -28,4 +28,25 @@ true true + +