diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } 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 7c900b0..93038fc 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(1000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } 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 7c900b0..93038fc 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(1000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); 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 83b3dcc..7a172d1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.media.MediaPlayer; import android.text.TextUtils; import android.view.View; @@ -90,17 +91,37 @@ } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } 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 7c900b0..93038fc 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(1000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); 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 83b3dcc..7a172d1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.media.MediaPlayer; import android.text.TextUtils; import android.view.View; @@ -90,17 +91,37 @@ } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); 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 586773f..dd1b425 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.content.Intent; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -141,10 +142,27 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) + @OnClick({R.id.locationMapView, R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseAudioView: String audioIdVerify = data.getAudioIdVerify(); String fileIdVerify = audioIdVerify.replace(" ", "").replace("\\", "/"); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } 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 7c900b0..93038fc 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(1000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); 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 83b3dcc..7a172d1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.media.MediaPlayer; import android.text.TextUtils; import android.view.View; @@ -90,17 +91,37 @@ } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); 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 586773f..dd1b425 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.content.Intent; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -141,10 +142,27 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) + @OnClick({R.id.locationMapView, R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseAudioView: String audioIdVerify = data.getAudioIdVerify(); String fileIdVerify = audioIdVerify.replace(" ", "").replace("\\", "/"); 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 46357b6..280ea51 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -126,11 +127,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } 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 7c900b0..93038fc 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(1000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); 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 83b3dcc..7a172d1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.media.MediaPlayer; import android.text.TextUtils; import android.view.View; @@ -90,17 +91,37 @@ } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); 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 586773f..dd1b425 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.content.Intent; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -141,10 +142,27 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) + @OnClick({R.id.locationMapView, R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseAudioView: String audioIdVerify = data.getAudioIdVerify(); String fileIdVerify = audioIdVerify.replace(" ", "").replace("\\", "/"); 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 46357b6..280ea51 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -126,11 +127,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 676a775..d6ae927 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -131,11 +132,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseHandleLayout}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.caseHandleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } 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 7c900b0..93038fc 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(1000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); 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 83b3dcc..7a172d1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.media.MediaPlayer; import android.text.TextUtils; import android.view.View; @@ -90,17 +91,37 @@ } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); 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 586773f..dd1b425 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.content.Intent; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -141,10 +142,27 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) + @OnClick({R.id.locationMapView, R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseAudioView: String audioIdVerify = data.getAudioIdVerify(); String fileIdVerify = audioIdVerify.replace(" ", "").replace("\\", "/"); 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 46357b6..280ea51 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -126,11 +127,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 676a775..d6ae927 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -131,11 +132,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseHandleLayout}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.caseHandleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 65f69e2..b1a47aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -619,7 +619,7 @@ mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, + "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), gridId, gridId, description, fieldIntro, diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } 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 7c900b0..93038fc 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(1000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); 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 83b3dcc..7a172d1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.media.MediaPlayer; import android.text.TextUtils; import android.view.View; @@ -90,17 +91,37 @@ } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); 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 586773f..dd1b425 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.content.Intent; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -141,10 +142,27 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) + @OnClick({R.id.locationMapView, R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseAudioView: String audioIdVerify = data.getAudioIdVerify(); String fileIdVerify = audioIdVerify.replace(" ", "").replace("\\", "/"); 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 46357b6..280ea51 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -126,11 +127,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 676a775..d6ae927 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -131,11 +132,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseHandleLayout}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.caseHandleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 65f69e2..b1a47aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -619,7 +619,7 @@ mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, + "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), gridId, gridId, description, fieldIntro, 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 41800f2..efa90e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,6 +6,7 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -137,7 +138,7 @@ private String typeCode; private String typeDetailCode; private String gridId; - private String longitude, latitude; + private double longitude, latitude; private String changeState; private MediaPlayer mediaPlayer; private UploadImagePresenterImpl uploadImagePresenter; @@ -443,12 +444,17 @@ ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } + if (longitude == 0 || latitude == 0) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - longitude, latitude, "1", gridId.substring(0, 6), + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); } } @@ -538,8 +544,10 @@ if (data == null) { return; } - longitude = data.getStringExtra("longitude"); - latitude = data.getStringExtra("latitude"); + longitude = data.getDoubleExtra("longitude", 0); + Log.d(TAG, "longitude: " + longitude); + latitude = data.getDoubleExtra("latitude", 0); + Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -557,6 +565,8 @@ } } + private static final String TAG = "CaseVerifyDetailActivit"; + @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } 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 7c900b0..93038fc 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(1000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); 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 83b3dcc..7a172d1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.media.MediaPlayer; import android.text.TextUtils; import android.view.View; @@ -90,17 +91,37 @@ } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); 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 586773f..dd1b425 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.content.Intent; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -141,10 +142,27 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) + @OnClick({R.id.locationMapView, R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseAudioView: String audioIdVerify = data.getAudioIdVerify(); String fileIdVerify = audioIdVerify.replace(" ", "").replace("\\", "/"); 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 46357b6..280ea51 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -126,11 +127,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 676a775..d6ae927 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -131,11 +132,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseHandleLayout}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.caseHandleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 65f69e2..b1a47aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -619,7 +619,7 @@ mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, + "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), gridId, gridId, description, fieldIntro, 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 41800f2..efa90e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,6 +6,7 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -137,7 +138,7 @@ private String typeCode; private String typeDetailCode; private String gridId; - private String longitude, latitude; + private double longitude, latitude; private String changeState; private MediaPlayer mediaPlayer; private UploadImagePresenterImpl uploadImagePresenter; @@ -443,12 +444,17 @@ ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } + if (longitude == 0 || latitude == 0) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - longitude, latitude, "1", gridId.substring(0, 6), + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); } } @@ -538,8 +544,10 @@ if (data == null) { return; } - longitude = data.getStringExtra("longitude"); - latitude = data.getStringExtra("latitude"); + longitude = data.getDoubleExtra("longitude", 0); + Log.d(TAG, "longitude: " + longitude); + latitude = data.getDoubleExtra("latitude", 0); + Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -557,6 +565,8 @@ } } + private static final String TAG = "CaseVerifyDetailActivit"; + @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 2b72d2c..3f40dae 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -62,21 +62,21 @@ String caseType = getIntent().getStringExtra("caseType"); lng = getIntent().getDoubleExtra("lng", 0); lat = getIntent().getDoubleExtra("lat", 0); -// Log.d(TAG, "[" + lng + "," + lat + "]"); +// Log.d(TAG, caseType + ",[" + lng + "," + lat + "]"); + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小 ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 - ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_SERVICE_URL); + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); - //社区 (ID: 4) - ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_SERVICE_URL + "/4"); + //社区 (ID: 15) + ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/15"); communityFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); FeatureLayer communityLayer = new FeatureLayer(communityFeatureTable); assert caseType != null; @@ -97,36 +97,17 @@ break; } mapView.setMap(arcGISMap); - mapView.setViewpointCenterAsync(new Point(lng, lat)); } -// @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { -// mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { -// @Override -// public boolean onSingleTapConfirmed(MotionEvent e) { -// android.graphics.Point screenPoint = new android.graphics.Point(Math.round(e.getX()), Math.round(e.getY())); -// Point clickPoint = mapView.screenToLocation(screenPoint); -// Log.d(TAG, "clickPoint: " + clickPoint); -// //[116.591999, 28.241346, 0.000000, NaN] SR: 4326 -// -// Point point = new Point(lng, lat, SpatialReference.create(4326)); -// Log.d(TAG, "point: " + point); -// //[116.650769, 28.216684, 0.000000, NaN] SR: 4326 -// -// addMarker(clickPoint); -// return super.onSingleTapConfirmed(e); -// } -// }); - } - - /** - * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 - */ - private void addMarker(Point clickPoint) { + Point point = new Point(lng, lat, mapView.getSpatialReference()); + mapView.setViewpointCenterAsync(point, 2000);//标注到指定经纬度并放大地图显示 + /** + * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 + */ SimpleMarkerSymbol simpleMarkerSymbol = new SimpleMarkerSymbol(SimpleMarkerSymbol.Style.CIRCLE, Color.RED, 15); - Graphic graphic = new Graphic(clickPoint, simpleMarkerSymbol); + Graphic graphic = new Graphic(point, simpleMarkerSymbol); GraphicsOverlay mGraphicsOverlay = new GraphicsOverlay(); ListenableList overlayGraphics = mGraphicsOverlay.getGraphics(); ListenableList graphicsOverlays = mapView.getGraphicsOverlays(); @@ -145,6 +126,7 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.removeToLocalView: +// mapView.setViewpointCenterAsync(new Point(lng, lat)); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } 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 7c900b0..93038fc 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(1000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); 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 83b3dcc..7a172d1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.media.MediaPlayer; import android.text.TextUtils; import android.view.View; @@ -90,17 +91,37 @@ } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); 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 586773f..dd1b425 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.content.Intent; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -141,10 +142,27 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) + @OnClick({R.id.locationMapView, R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseAudioView: String audioIdVerify = data.getAudioIdVerify(); String fileIdVerify = audioIdVerify.replace(" ", "").replace("\\", "/"); 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 46357b6..280ea51 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -126,11 +127,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 676a775..d6ae927 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -131,11 +132,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseHandleLayout}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.caseHandleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 65f69e2..b1a47aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -619,7 +619,7 @@ mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, + "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), gridId, gridId, description, fieldIntro, 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 41800f2..efa90e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,6 +6,7 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -137,7 +138,7 @@ private String typeCode; private String typeDetailCode; private String gridId; - private String longitude, latitude; + private double longitude, latitude; private String changeState; private MediaPlayer mediaPlayer; private UploadImagePresenterImpl uploadImagePresenter; @@ -443,12 +444,17 @@ ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } + if (longitude == 0 || latitude == 0) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - longitude, latitude, "1", gridId.substring(0, 6), + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); } } @@ -538,8 +544,10 @@ if (data == null) { return; } - longitude = data.getStringExtra("longitude"); - latitude = data.getStringExtra("latitude"); + longitude = data.getDoubleExtra("longitude", 0); + Log.d(TAG, "longitude: " + longitude); + latitude = data.getDoubleExtra("latitude", 0); + Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -557,6 +565,8 @@ } } + private static final String TAG = "CaseVerifyDetailActivit"; + @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 2b72d2c..3f40dae 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -62,21 +62,21 @@ String caseType = getIntent().getStringExtra("caseType"); lng = getIntent().getDoubleExtra("lng", 0); lat = getIntent().getDoubleExtra("lat", 0); -// Log.d(TAG, "[" + lng + "," + lat + "]"); +// Log.d(TAG, caseType + ",[" + lng + "," + lat + "]"); + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小 ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 - ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_SERVICE_URL); + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); - //社区 (ID: 4) - ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_SERVICE_URL + "/4"); + //社区 (ID: 15) + ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/15"); communityFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); FeatureLayer communityLayer = new FeatureLayer(communityFeatureTable); assert caseType != null; @@ -97,36 +97,17 @@ break; } mapView.setMap(arcGISMap); - mapView.setViewpointCenterAsync(new Point(lng, lat)); } -// @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { -// mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { -// @Override -// public boolean onSingleTapConfirmed(MotionEvent e) { -// android.graphics.Point screenPoint = new android.graphics.Point(Math.round(e.getX()), Math.round(e.getY())); -// Point clickPoint = mapView.screenToLocation(screenPoint); -// Log.d(TAG, "clickPoint: " + clickPoint); -// //[116.591999, 28.241346, 0.000000, NaN] SR: 4326 -// -// Point point = new Point(lng, lat, SpatialReference.create(4326)); -// Log.d(TAG, "point: " + point); -// //[116.650769, 28.216684, 0.000000, NaN] SR: 4326 -// -// addMarker(clickPoint); -// return super.onSingleTapConfirmed(e); -// } -// }); - } - - /** - * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 - */ - private void addMarker(Point clickPoint) { + Point point = new Point(lng, lat, mapView.getSpatialReference()); + mapView.setViewpointCenterAsync(point, 2000);//标注到指定经纬度并放大地图显示 + /** + * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 + */ SimpleMarkerSymbol simpleMarkerSymbol = new SimpleMarkerSymbol(SimpleMarkerSymbol.Style.CIRCLE, Color.RED, 15); - Graphic graphic = new Graphic(clickPoint, simpleMarkerSymbol); + Graphic graphic = new Graphic(point, simpleMarkerSymbol); GraphicsOverlay mGraphicsOverlay = new GraphicsOverlay(); ListenableList overlayGraphics = mGraphicsOverlay.getGraphics(); ListenableList graphicsOverlays = mapView.getGraphicsOverlays(); @@ -145,6 +126,7 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.removeToLocalView: +// mapView.setViewpointCenterAsync(new Point(lng, lat)); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index fa2df7a..5fb7eb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -120,7 +120,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandledAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } 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 7c900b0..93038fc 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(1000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); 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 83b3dcc..7a172d1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.media.MediaPlayer; import android.text.TextUtils; import android.view.View; @@ -90,17 +91,37 @@ } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); 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 586773f..dd1b425 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.content.Intent; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -141,10 +142,27 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) + @OnClick({R.id.locationMapView, R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseAudioView: String audioIdVerify = data.getAudioIdVerify(); String fileIdVerify = audioIdVerify.replace(" ", "").replace("\\", "/"); 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 46357b6..280ea51 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -126,11 +127,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 676a775..d6ae927 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -131,11 +132,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseHandleLayout}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.caseHandleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 65f69e2..b1a47aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -619,7 +619,7 @@ mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, + "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), gridId, gridId, description, fieldIntro, 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 41800f2..efa90e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,6 +6,7 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -137,7 +138,7 @@ private String typeCode; private String typeDetailCode; private String gridId; - private String longitude, latitude; + private double longitude, latitude; private String changeState; private MediaPlayer mediaPlayer; private UploadImagePresenterImpl uploadImagePresenter; @@ -443,12 +444,17 @@ ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } + if (longitude == 0 || latitude == 0) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - longitude, latitude, "1", gridId.substring(0, 6), + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); } } @@ -538,8 +544,10 @@ if (data == null) { return; } - longitude = data.getStringExtra("longitude"); - latitude = data.getStringExtra("latitude"); + longitude = data.getDoubleExtra("longitude", 0); + Log.d(TAG, "longitude: " + longitude); + latitude = data.getDoubleExtra("latitude", 0); + Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -557,6 +565,8 @@ } } + private static final String TAG = "CaseVerifyDetailActivit"; + @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 2b72d2c..3f40dae 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -62,21 +62,21 @@ String caseType = getIntent().getStringExtra("caseType"); lng = getIntent().getDoubleExtra("lng", 0); lat = getIntent().getDoubleExtra("lat", 0); -// Log.d(TAG, "[" + lng + "," + lat + "]"); +// Log.d(TAG, caseType + ",[" + lng + "," + lat + "]"); + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小 ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 - ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_SERVICE_URL); + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); - //社区 (ID: 4) - ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_SERVICE_URL + "/4"); + //社区 (ID: 15) + ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/15"); communityFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); FeatureLayer communityLayer = new FeatureLayer(communityFeatureTable); assert caseType != null; @@ -97,36 +97,17 @@ break; } mapView.setMap(arcGISMap); - mapView.setViewpointCenterAsync(new Point(lng, lat)); } -// @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { -// mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { -// @Override -// public boolean onSingleTapConfirmed(MotionEvent e) { -// android.graphics.Point screenPoint = new android.graphics.Point(Math.round(e.getX()), Math.round(e.getY())); -// Point clickPoint = mapView.screenToLocation(screenPoint); -// Log.d(TAG, "clickPoint: " + clickPoint); -// //[116.591999, 28.241346, 0.000000, NaN] SR: 4326 -// -// Point point = new Point(lng, lat, SpatialReference.create(4326)); -// Log.d(TAG, "point: " + point); -// //[116.650769, 28.216684, 0.000000, NaN] SR: 4326 -// -// addMarker(clickPoint); -// return super.onSingleTapConfirmed(e); -// } -// }); - } - - /** - * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 - */ - private void addMarker(Point clickPoint) { + Point point = new Point(lng, lat, mapView.getSpatialReference()); + mapView.setViewpointCenterAsync(point, 2000);//标注到指定经纬度并放大地图显示 + /** + * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 + */ SimpleMarkerSymbol simpleMarkerSymbol = new SimpleMarkerSymbol(SimpleMarkerSymbol.Style.CIRCLE, Color.RED, 15); - Graphic graphic = new Graphic(clickPoint, simpleMarkerSymbol); + Graphic graphic = new Graphic(point, simpleMarkerSymbol); GraphicsOverlay mGraphicsOverlay = new GraphicsOverlay(); ListenableList overlayGraphics = mGraphicsOverlay.getGraphics(); ListenableList graphicsOverlays = mapView.getGraphicsOverlays(); @@ -145,6 +126,7 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.removeToLocalView: +// mapView.setViewpointCenterAsync(new Point(lng, lat)); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index fa2df7a..5fb7eb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -120,7 +120,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandledAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 05306fe..c7b467c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -122,7 +122,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandleAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } 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 7c900b0..93038fc 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(1000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); 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 83b3dcc..7a172d1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.media.MediaPlayer; import android.text.TextUtils; import android.view.View; @@ -90,17 +91,37 @@ } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); 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 586773f..dd1b425 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.content.Intent; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -141,10 +142,27 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) + @OnClick({R.id.locationMapView, R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseAudioView: String audioIdVerify = data.getAudioIdVerify(); String fileIdVerify = audioIdVerify.replace(" ", "").replace("\\", "/"); 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 46357b6..280ea51 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -126,11 +127,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 676a775..d6ae927 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -131,11 +132,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseHandleLayout}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.caseHandleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 65f69e2..b1a47aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -619,7 +619,7 @@ mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, + "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), gridId, gridId, description, fieldIntro, 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 41800f2..efa90e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,6 +6,7 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -137,7 +138,7 @@ private String typeCode; private String typeDetailCode; private String gridId; - private String longitude, latitude; + private double longitude, latitude; private String changeState; private MediaPlayer mediaPlayer; private UploadImagePresenterImpl uploadImagePresenter; @@ -443,12 +444,17 @@ ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } + if (longitude == 0 || latitude == 0) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - longitude, latitude, "1", gridId.substring(0, 6), + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); } } @@ -538,8 +544,10 @@ if (data == null) { return; } - longitude = data.getStringExtra("longitude"); - latitude = data.getStringExtra("latitude"); + longitude = data.getDoubleExtra("longitude", 0); + Log.d(TAG, "longitude: " + longitude); + latitude = data.getDoubleExtra("latitude", 0); + Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -557,6 +565,8 @@ } } + private static final String TAG = "CaseVerifyDetailActivit"; + @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 2b72d2c..3f40dae 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -62,21 +62,21 @@ String caseType = getIntent().getStringExtra("caseType"); lng = getIntent().getDoubleExtra("lng", 0); lat = getIntent().getDoubleExtra("lat", 0); -// Log.d(TAG, "[" + lng + "," + lat + "]"); +// Log.d(TAG, caseType + ",[" + lng + "," + lat + "]"); + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小 ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 - ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_SERVICE_URL); + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); - //社区 (ID: 4) - ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_SERVICE_URL + "/4"); + //社区 (ID: 15) + ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/15"); communityFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); FeatureLayer communityLayer = new FeatureLayer(communityFeatureTable); assert caseType != null; @@ -97,36 +97,17 @@ break; } mapView.setMap(arcGISMap); - mapView.setViewpointCenterAsync(new Point(lng, lat)); } -// @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { -// mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { -// @Override -// public boolean onSingleTapConfirmed(MotionEvent e) { -// android.graphics.Point screenPoint = new android.graphics.Point(Math.round(e.getX()), Math.round(e.getY())); -// Point clickPoint = mapView.screenToLocation(screenPoint); -// Log.d(TAG, "clickPoint: " + clickPoint); -// //[116.591999, 28.241346, 0.000000, NaN] SR: 4326 -// -// Point point = new Point(lng, lat, SpatialReference.create(4326)); -// Log.d(TAG, "point: " + point); -// //[116.650769, 28.216684, 0.000000, NaN] SR: 4326 -// -// addMarker(clickPoint); -// return super.onSingleTapConfirmed(e); -// } -// }); - } - - /** - * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 - */ - private void addMarker(Point clickPoint) { + Point point = new Point(lng, lat, mapView.getSpatialReference()); + mapView.setViewpointCenterAsync(point, 2000);//标注到指定经纬度并放大地图显示 + /** + * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 + */ SimpleMarkerSymbol simpleMarkerSymbol = new SimpleMarkerSymbol(SimpleMarkerSymbol.Style.CIRCLE, Color.RED, 15); - Graphic graphic = new Graphic(clickPoint, simpleMarkerSymbol); + Graphic graphic = new Graphic(point, simpleMarkerSymbol); GraphicsOverlay mGraphicsOverlay = new GraphicsOverlay(); ListenableList overlayGraphics = mGraphicsOverlay.getGraphics(); ListenableList graphicsOverlays = mapView.getGraphicsOverlays(); @@ -145,6 +126,7 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.removeToLocalView: +// mapView.setViewpointCenterAsync(new Point(lng, lat)); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index fa2df7a..5fb7eb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -120,7 +120,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandledAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 05306fe..c7b467c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -122,7 +122,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandleAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 743a092..feec285 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -123,7 +123,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有超时案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandleAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } 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 7c900b0..93038fc 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(1000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); 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 83b3dcc..7a172d1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.media.MediaPlayer; import android.text.TextUtils; import android.view.View; @@ -90,17 +91,37 @@ } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); 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 586773f..dd1b425 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.content.Intent; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -141,10 +142,27 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) + @OnClick({R.id.locationMapView, R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseAudioView: String audioIdVerify = data.getAudioIdVerify(); String fileIdVerify = audioIdVerify.replace(" ", "").replace("\\", "/"); 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 46357b6..280ea51 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -126,11 +127,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 676a775..d6ae927 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -131,11 +132,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseHandleLayout}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.caseHandleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 65f69e2..b1a47aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -619,7 +619,7 @@ mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, + "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), gridId, gridId, description, fieldIntro, 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 41800f2..efa90e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,6 +6,7 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -137,7 +138,7 @@ private String typeCode; private String typeDetailCode; private String gridId; - private String longitude, latitude; + private double longitude, latitude; private String changeState; private MediaPlayer mediaPlayer; private UploadImagePresenterImpl uploadImagePresenter; @@ -443,12 +444,17 @@ ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } + if (longitude == 0 || latitude == 0) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - longitude, latitude, "1", gridId.substring(0, 6), + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); } } @@ -538,8 +544,10 @@ if (data == null) { return; } - longitude = data.getStringExtra("longitude"); - latitude = data.getStringExtra("latitude"); + longitude = data.getDoubleExtra("longitude", 0); + Log.d(TAG, "longitude: " + longitude); + latitude = data.getDoubleExtra("latitude", 0); + Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -557,6 +565,8 @@ } } + private static final String TAG = "CaseVerifyDetailActivit"; + @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 2b72d2c..3f40dae 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -62,21 +62,21 @@ String caseType = getIntent().getStringExtra("caseType"); lng = getIntent().getDoubleExtra("lng", 0); lat = getIntent().getDoubleExtra("lat", 0); -// Log.d(TAG, "[" + lng + "," + lat + "]"); +// Log.d(TAG, caseType + ",[" + lng + "," + lat + "]"); + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小 ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 - ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_SERVICE_URL); + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); - //社区 (ID: 4) - ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_SERVICE_URL + "/4"); + //社区 (ID: 15) + ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/15"); communityFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); FeatureLayer communityLayer = new FeatureLayer(communityFeatureTable); assert caseType != null; @@ -97,36 +97,17 @@ break; } mapView.setMap(arcGISMap); - mapView.setViewpointCenterAsync(new Point(lng, lat)); } -// @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { -// mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { -// @Override -// public boolean onSingleTapConfirmed(MotionEvent e) { -// android.graphics.Point screenPoint = new android.graphics.Point(Math.round(e.getX()), Math.round(e.getY())); -// Point clickPoint = mapView.screenToLocation(screenPoint); -// Log.d(TAG, "clickPoint: " + clickPoint); -// //[116.591999, 28.241346, 0.000000, NaN] SR: 4326 -// -// Point point = new Point(lng, lat, SpatialReference.create(4326)); -// Log.d(TAG, "point: " + point); -// //[116.650769, 28.216684, 0.000000, NaN] SR: 4326 -// -// addMarker(clickPoint); -// return super.onSingleTapConfirmed(e); -// } -// }); - } - - /** - * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 - */ - private void addMarker(Point clickPoint) { + Point point = new Point(lng, lat, mapView.getSpatialReference()); + mapView.setViewpointCenterAsync(point, 2000);//标注到指定经纬度并放大地图显示 + /** + * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 + */ SimpleMarkerSymbol simpleMarkerSymbol = new SimpleMarkerSymbol(SimpleMarkerSymbol.Style.CIRCLE, Color.RED, 15); - Graphic graphic = new Graphic(clickPoint, simpleMarkerSymbol); + Graphic graphic = new Graphic(point, simpleMarkerSymbol); GraphicsOverlay mGraphicsOverlay = new GraphicsOverlay(); ListenableList overlayGraphics = mGraphicsOverlay.getGraphics(); ListenableList graphicsOverlays = mapView.getGraphicsOverlays(); @@ -145,6 +126,7 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.removeToLocalView: +// mapView.setViewpointCenterAsync(new Point(lng, lat)); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index fa2df7a..5fb7eb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -120,7 +120,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandledAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 05306fe..c7b467c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -122,7 +122,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandleAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 743a092..feec285 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -123,7 +123,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有超时案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandleAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index ae0b3e5..2ee3f1a 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -123,7 +123,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandleAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } 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 7c900b0..93038fc 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(1000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); 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 83b3dcc..7a172d1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.media.MediaPlayer; import android.text.TextUtils; import android.view.View; @@ -90,17 +91,37 @@ } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); 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 586773f..dd1b425 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.content.Intent; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -141,10 +142,27 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) + @OnClick({R.id.locationMapView, R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseAudioView: String audioIdVerify = data.getAudioIdVerify(); String fileIdVerify = audioIdVerify.replace(" ", "").replace("\\", "/"); 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 46357b6..280ea51 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -126,11 +127,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 676a775..d6ae927 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -131,11 +132,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseHandleLayout}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.caseHandleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 65f69e2..b1a47aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -619,7 +619,7 @@ mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, + "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), gridId, gridId, description, fieldIntro, 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 41800f2..efa90e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,6 +6,7 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -137,7 +138,7 @@ private String typeCode; private String typeDetailCode; private String gridId; - private String longitude, latitude; + private double longitude, latitude; private String changeState; private MediaPlayer mediaPlayer; private UploadImagePresenterImpl uploadImagePresenter; @@ -443,12 +444,17 @@ ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } + if (longitude == 0 || latitude == 0) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - longitude, latitude, "1", gridId.substring(0, 6), + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); } } @@ -538,8 +544,10 @@ if (data == null) { return; } - longitude = data.getStringExtra("longitude"); - latitude = data.getStringExtra("latitude"); + longitude = data.getDoubleExtra("longitude", 0); + Log.d(TAG, "longitude: " + longitude); + latitude = data.getDoubleExtra("latitude", 0); + Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -557,6 +565,8 @@ } } + private static final String TAG = "CaseVerifyDetailActivit"; + @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 2b72d2c..3f40dae 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -62,21 +62,21 @@ String caseType = getIntent().getStringExtra("caseType"); lng = getIntent().getDoubleExtra("lng", 0); lat = getIntent().getDoubleExtra("lat", 0); -// Log.d(TAG, "[" + lng + "," + lat + "]"); +// Log.d(TAG, caseType + ",[" + lng + "," + lat + "]"); + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小 ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 - ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_SERVICE_URL); + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); - //社区 (ID: 4) - ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_SERVICE_URL + "/4"); + //社区 (ID: 15) + ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/15"); communityFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); FeatureLayer communityLayer = new FeatureLayer(communityFeatureTable); assert caseType != null; @@ -97,36 +97,17 @@ break; } mapView.setMap(arcGISMap); - mapView.setViewpointCenterAsync(new Point(lng, lat)); } -// @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { -// mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { -// @Override -// public boolean onSingleTapConfirmed(MotionEvent e) { -// android.graphics.Point screenPoint = new android.graphics.Point(Math.round(e.getX()), Math.round(e.getY())); -// Point clickPoint = mapView.screenToLocation(screenPoint); -// Log.d(TAG, "clickPoint: " + clickPoint); -// //[116.591999, 28.241346, 0.000000, NaN] SR: 4326 -// -// Point point = new Point(lng, lat, SpatialReference.create(4326)); -// Log.d(TAG, "point: " + point); -// //[116.650769, 28.216684, 0.000000, NaN] SR: 4326 -// -// addMarker(clickPoint); -// return super.onSingleTapConfirmed(e); -// } -// }); - } - - /** - * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 - */ - private void addMarker(Point clickPoint) { + Point point = new Point(lng, lat, mapView.getSpatialReference()); + mapView.setViewpointCenterAsync(point, 2000);//标注到指定经纬度并放大地图显示 + /** + * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 + */ SimpleMarkerSymbol simpleMarkerSymbol = new SimpleMarkerSymbol(SimpleMarkerSymbol.Style.CIRCLE, Color.RED, 15); - Graphic graphic = new Graphic(clickPoint, simpleMarkerSymbol); + Graphic graphic = new Graphic(point, simpleMarkerSymbol); GraphicsOverlay mGraphicsOverlay = new GraphicsOverlay(); ListenableList overlayGraphics = mGraphicsOverlay.getGraphics(); ListenableList graphicsOverlays = mapView.getGraphicsOverlays(); @@ -145,6 +126,7 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.removeToLocalView: +// mapView.setViewpointCenterAsync(new Point(lng, lat)); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index fa2df7a..5fb7eb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -120,7 +120,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandledAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 05306fe..c7b467c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -122,7 +122,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandleAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 743a092..feec285 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -123,7 +123,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有超时案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandleAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index ae0b3e5..2ee3f1a 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -123,7 +123,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandleAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index b5da2aa..03319fa 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -80,12 +80,12 @@ * 提交案卷 */ @FormUrlEncoded - @POST("/case/add") + @POST("/case/addAPP") Observable submitCase(@Header("token") String token, @Field("isNeedVerify") String isNeedVerify, @Field("isNeedRevisit") String isNeedRevisit, - @Field("longitude") String longitude, - @Field("latitude") String latitude, + @Field("lng") String longitude, + @Field("lat") String latitude, @Field("source") String source, @Field("caseLevel") String caseLevel, @Field("eorc") String eorc, @@ -257,12 +257,12 @@ * 五包上报 */ @FormUrlEncoded - @POST("/case/add") + @POST("/case/addAPP") Observable submitShopCase(@Header("token") String token, @Field("isNeedVerify") String isNeedVerify, @Field("isNeedRevisit") String isNeedRevisit, - @Field("longitude") String longitude, - @Field("latitude") String latitude, + @Field("lng") String longitude, + @Field("lat") String latitude, @Field("source") String source, @Field("caseLevel") String caseLevel, @Field("areaCode") String areaCode, diff --git a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } 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 7c900b0..93038fc 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(1000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); 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 83b3dcc..7a172d1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.media.MediaPlayer; import android.text.TextUtils; import android.view.View; @@ -90,17 +91,37 @@ } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); 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 586773f..dd1b425 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.content.Intent; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -141,10 +142,27 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) + @OnClick({R.id.locationMapView, R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseAudioView: String audioIdVerify = data.getAudioIdVerify(); String fileIdVerify = audioIdVerify.replace(" ", "").replace("\\", "/"); 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 46357b6..280ea51 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -126,11 +127,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 676a775..d6ae927 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -131,11 +132,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseHandleLayout}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.caseHandleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 65f69e2..b1a47aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -619,7 +619,7 @@ mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, + "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), gridId, gridId, description, fieldIntro, 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 41800f2..efa90e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,6 +6,7 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -137,7 +138,7 @@ private String typeCode; private String typeDetailCode; private String gridId; - private String longitude, latitude; + private double longitude, latitude; private String changeState; private MediaPlayer mediaPlayer; private UploadImagePresenterImpl uploadImagePresenter; @@ -443,12 +444,17 @@ ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } + if (longitude == 0 || latitude == 0) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - longitude, latitude, "1", gridId.substring(0, 6), + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); } } @@ -538,8 +544,10 @@ if (data == null) { return; } - longitude = data.getStringExtra("longitude"); - latitude = data.getStringExtra("latitude"); + longitude = data.getDoubleExtra("longitude", 0); + Log.d(TAG, "longitude: " + longitude); + latitude = data.getDoubleExtra("latitude", 0); + Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -557,6 +565,8 @@ } } + private static final String TAG = "CaseVerifyDetailActivit"; + @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 2b72d2c..3f40dae 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -62,21 +62,21 @@ String caseType = getIntent().getStringExtra("caseType"); lng = getIntent().getDoubleExtra("lng", 0); lat = getIntent().getDoubleExtra("lat", 0); -// Log.d(TAG, "[" + lng + "," + lat + "]"); +// Log.d(TAG, caseType + ",[" + lng + "," + lat + "]"); + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小 ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 - ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_SERVICE_URL); + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); - //社区 (ID: 4) - ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_SERVICE_URL + "/4"); + //社区 (ID: 15) + ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/15"); communityFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); FeatureLayer communityLayer = new FeatureLayer(communityFeatureTable); assert caseType != null; @@ -97,36 +97,17 @@ break; } mapView.setMap(arcGISMap); - mapView.setViewpointCenterAsync(new Point(lng, lat)); } -// @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { -// mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { -// @Override -// public boolean onSingleTapConfirmed(MotionEvent e) { -// android.graphics.Point screenPoint = new android.graphics.Point(Math.round(e.getX()), Math.round(e.getY())); -// Point clickPoint = mapView.screenToLocation(screenPoint); -// Log.d(TAG, "clickPoint: " + clickPoint); -// //[116.591999, 28.241346, 0.000000, NaN] SR: 4326 -// -// Point point = new Point(lng, lat, SpatialReference.create(4326)); -// Log.d(TAG, "point: " + point); -// //[116.650769, 28.216684, 0.000000, NaN] SR: 4326 -// -// addMarker(clickPoint); -// return super.onSingleTapConfirmed(e); -// } -// }); - } - - /** - * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 - */ - private void addMarker(Point clickPoint) { + Point point = new Point(lng, lat, mapView.getSpatialReference()); + mapView.setViewpointCenterAsync(point, 2000);//标注到指定经纬度并放大地图显示 + /** + * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 + */ SimpleMarkerSymbol simpleMarkerSymbol = new SimpleMarkerSymbol(SimpleMarkerSymbol.Style.CIRCLE, Color.RED, 15); - Graphic graphic = new Graphic(clickPoint, simpleMarkerSymbol); + Graphic graphic = new Graphic(point, simpleMarkerSymbol); GraphicsOverlay mGraphicsOverlay = new GraphicsOverlay(); ListenableList overlayGraphics = mGraphicsOverlay.getGraphics(); ListenableList graphicsOverlays = mapView.getGraphicsOverlays(); @@ -145,6 +126,7 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.removeToLocalView: +// mapView.setViewpointCenterAsync(new Point(lng, lat)); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index fa2df7a..5fb7eb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -120,7 +120,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandledAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 05306fe..c7b467c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -122,7 +122,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandleAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 743a092..feec285 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -123,7 +123,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有超时案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandleAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index ae0b3e5..2ee3f1a 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -123,7 +123,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandleAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index b5da2aa..03319fa 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -80,12 +80,12 @@ * 提交案卷 */ @FormUrlEncoded - @POST("/case/add") + @POST("/case/addAPP") Observable submitCase(@Header("token") String token, @Field("isNeedVerify") String isNeedVerify, @Field("isNeedRevisit") String isNeedRevisit, - @Field("longitude") String longitude, - @Field("latitude") String latitude, + @Field("lng") String longitude, + @Field("lat") String latitude, @Field("source") String source, @Field("caseLevel") String caseLevel, @Field("eorc") String eorc, @@ -257,12 +257,12 @@ * 五包上报 */ @FormUrlEncoded - @POST("/case/add") + @POST("/case/addAPP") Observable submitShopCase(@Header("token") String token, @Field("isNeedVerify") String isNeedVerify, @Field("isNeedRevisit") String isNeedRevisit, - @Field("longitude") String longitude, - @Field("latitude") String latitude, + @Field("lng") String longitude, + @Field("lat") String latitude, @Field("source") String source, @Field("caseLevel") String caseLevel, @Field("areaCode") String areaCode, 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 9cdf5a1..0412275 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,5 +1,7 @@ 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; @@ -63,7 +65,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/mvp/model/AuthenticateModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java index 7984cdd..91c75be 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/AuthenticateModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (onAuthenticateListener != null) { + if (e.getCause() != null) { onAuthenticateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java index be72c4c..b9733d2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index b976f9e..450e710 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java index 5258d89..b3e5dc4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCommonSentenceModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (sentenceListener != null) { + if (e.getCause() != null) { sentenceListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java index a2dd491..2e4d10a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseDetailModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -47,4 +47,6 @@ } }); } + + private static final String TAG = "CaseDetailModelImpl"; } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java index 435678b..60ccce4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java index 78c0c31..ff540c7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandleModelImpl.java @@ -43,7 +43,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -69,7 +69,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } @@ -100,7 +100,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java index 2a9888b..902564e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseHandledListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java index 6b1a217..be0ba20 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseLargeClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 1e4da66..918217a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -36,7 +36,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java index b387a71..464605d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseNextNodeModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java index 27509e5..9187d9c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseProcessModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java index a8f4c28..867ff4c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSmallClassModelImpl.java @@ -28,7 +28,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java index 7e602dc..705c9e2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseStatusModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java index 97c0e65..4505ac2 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseSubmitModelImpl.java @@ -53,7 +53,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java index a8cb3fc..9bc3cde 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseUpdateSuperviseModelImpl.java @@ -37,7 +37,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index 46943af..b2882c1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java index 7f2ad3e..e169bd7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifyModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java index 9c0d5e4..49449b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ChangePasswordModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java index c9af913..5ced98c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/DeptTreeModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java index cc3d4d7..50e6965 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/EventSourceModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java index 842b62c..ed2d7c4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/HighEventModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java index cac6a2d..ab6c3a4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (loginListener != null) { + if (e.getCause() != null) { loginListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java index 4382b81..a6ca24b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginOutActionModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java index 1b6d597..5259f27 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/OvertimeCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java index 7c82995..392a6f3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PersonOnlineModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java index 48247c2..38b656a 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/PhoneBookModelImpl.java @@ -42,7 +42,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 9f23a3d..0e33db5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -48,7 +48,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java index a005f41..ed53f38 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UpdateVersionModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (updateListener != null) { + if (e.getCause() != null) { updateListener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d32f915..35c2cec 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 042121b..4ec69ac 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java index e600d25..8fb38b7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -40,7 +40,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java index 35c779b..6b79eb1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UrgentCaseListModelImpl.java @@ -34,7 +34,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java index e033292..0c49815 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UserDataModelImpl.java @@ -38,7 +38,7 @@ @Override public void onError(Throwable e) { - if (listener != null) { + if (e.getCause() != null) { listener.onFailure(e); } } 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 7c900b0..93038fc 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(1000);//数字越大，放大比例越小，缩放比例[36000,250] + mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小，缩放比例[36000,250] ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); 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 83b3dcc..7a172d1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.media.MediaPlayer; import android.text.TextUtils; import android.view.View; @@ -90,17 +91,37 @@ } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } @Override public void obtainCaseDetailData(CaseDetailBean resultBean) { -// Log.d(TAG, "obtainCaseDetailData: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { this.data = resultBean.getData().get(0); caseNumberView.setText(data.getCaseid()); 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 586773f..dd1b425 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.content.Intent; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -141,10 +142,27 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseAudioView, R.id.handleRecordLayout}) + @OnClick({R.id.locationMapView, R.id.caseAudioView, R.id.handleRecordLayout}) @Override public void onClick(View v) { switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; case R.id.caseAudioView: String audioIdVerify = data.getAudioIdVerify(); String fileIdVerify = audioIdVerify.replace(" ", "").replace("\\", "/"); 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 46357b6..280ea51 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -126,11 +127,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick(R.id.handleLayout) + @OnClick({R.id.locationMapView, R.id.handleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.handleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 676a775..d6ae927 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; import android.content.Context; +import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -131,11 +132,32 @@ ToastHelper.showToast("获取案卷详情失败", ToastHelper.ERROR); } - @OnClick({R.id.caseHandleLayout}) + @OnClick({R.id.locationMapView, R.id.caseHandleLayout}) @Override public void onClick(View v) { - if (v.getId() == R.id.caseHandleLayout) { - OtherUtils.showCaseProcess(this, data.getProcessId()); + switch (v.getId()) { + case R.id.locationMapView: + Intent intent = new Intent(this, DisplayMapActivity.class); + intent.putExtra("caseType", data.getEorcName()); + String dataLng = data.getLng(); + if (TextUtils.isEmpty(dataLng)) { + ToastHelper.showToast("案卷经度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = data.getLat(); + if (TextUtils.isEmpty(dataLat)) { + ToastHelper.showToast("案卷纬度异常", ToastHelper.ERROR); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + break; + case R.id.handleLayout: + OtherUtils.showCaseProcess(this, data.getProcessId()); + break; + default: + break; } } 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 65f69e2..b1a47aa 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -619,7 +619,7 @@ mediaList.addAll(imageList); } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, + "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), gridId, gridId, description, fieldIntro, 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 41800f2..efa90e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,6 +6,7 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -137,7 +138,7 @@ private String typeCode; private String typeDetailCode; private String gridId; - private String longitude, latitude; + private double longitude, latitude; private String changeState; private MediaPlayer mediaPlayer; private UploadImagePresenterImpl uploadImagePresenter; @@ -443,12 +444,17 @@ ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } + if (longitude == 0 || latitude == 0) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } caseHandlePresenter.onReadyRetrofitRequest(data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(mediaList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - longitude, latitude, "1", gridId.substring(0, 6), + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); } } @@ -538,8 +544,10 @@ if (data == null) { return; } - longitude = data.getStringExtra("longitude"); - latitude = data.getStringExtra("latitude"); + longitude = data.getDoubleExtra("longitude", 0); + Log.d(TAG, "longitude: " + longitude); + latitude = data.getDoubleExtra("latitude", 0); + Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -557,6 +565,8 @@ } } + private static final String TAG = "CaseVerifyDetailActivit"; + @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index 2b72d2c..3f40dae 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -62,21 +62,21 @@ String caseType = getIntent().getStringExtra("caseType"); lng = getIntent().getDoubleExtra("lng", 0); lat = getIntent().getDoubleExtra("lat", 0); -// Log.d(TAG, "[" + lng + "," + lat + "]"); +// Log.d(TAG, caseType + ",[" + lng + "," + lat + "]"); + mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(500);//数字越大，放大比例越小 ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); arcGISMap.setMinScale(36000); arcGISMap.setMaxScale(250); //创建底图、并设置底图图层 - ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_SERVICE_URL); + ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); - //社区 (ID: 4) - ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_SERVICE_URL + "/4"); + //社区 (ID: 15) + ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/15"); communityFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); FeatureLayer communityLayer = new FeatureLayer(communityFeatureTable); assert caseType != null; @@ -97,36 +97,17 @@ break; } mapView.setMap(arcGISMap); - mapView.setViewpointCenterAsync(new Point(lng, lat)); } -// @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { -// mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { -// @Override -// public boolean onSingleTapConfirmed(MotionEvent e) { -// android.graphics.Point screenPoint = new android.graphics.Point(Math.round(e.getX()), Math.round(e.getY())); -// Point clickPoint = mapView.screenToLocation(screenPoint); -// Log.d(TAG, "clickPoint: " + clickPoint); -// //[116.591999, 28.241346, 0.000000, NaN] SR: 4326 -// -// Point point = new Point(lng, lat, SpatialReference.create(4326)); -// Log.d(TAG, "point: " + point); -// //[116.650769, 28.216684, 0.000000, NaN] SR: 4326 -// -// addMarker(clickPoint); -// return super.onSingleTapConfirmed(e); -// } -// }); - } - - /** - * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 - */ - private void addMarker(Point clickPoint) { + Point point = new Point(lng, lat, mapView.getSpatialReference()); + mapView.setViewpointCenterAsync(point, 2000);//标注到指定经纬度并放大地图显示 + /** + * //[116.598359, 28.247870, 0.000000, NaN] SR: 4326 + */ SimpleMarkerSymbol simpleMarkerSymbol = new SimpleMarkerSymbol(SimpleMarkerSymbol.Style.CIRCLE, Color.RED, 15); - Graphic graphic = new Graphic(clickPoint, simpleMarkerSymbol); + Graphic graphic = new Graphic(point, simpleMarkerSymbol); GraphicsOverlay mGraphicsOverlay = new GraphicsOverlay(); ListenableList overlayGraphics = mGraphicsOverlay.getGraphics(); ListenableList graphicsOverlays = mapView.getGraphicsOverlays(); @@ -145,6 +126,7 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.removeToLocalView: +// mapView.setViewpointCenterAsync(new Point(lng, lat)); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override public void onLocationGet(Location location) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index fa2df7a..5fb7eb8 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -120,7 +120,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandledAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 05306fe..c7b467c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -122,7 +122,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandleAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 743a092..feec285 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -123,7 +123,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有超时案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandleAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index ae0b3e5..2ee3f1a 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -123,7 +123,7 @@ } else { //首次加载数据 if (dataBeans.size() == 0) { - emptyView.show("没有紧急案卷", null); + emptyView.show("没有案卷需要处理", null); } else { emptyView.hide(); adapter = new CaseHandleAdapter(context, dataBeans); diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index b5da2aa..03319fa 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -80,12 +80,12 @@ * 提交案卷 */ @FormUrlEncoded - @POST("/case/add") + @POST("/case/addAPP") Observable submitCase(@Header("token") String token, @Field("isNeedVerify") String isNeedVerify, @Field("isNeedRevisit") String isNeedRevisit, - @Field("longitude") String longitude, - @Field("latitude") String latitude, + @Field("lng") String longitude, + @Field("lat") String latitude, @Field("source") String source, @Field("caseLevel") String caseLevel, @Field("eorc") String eorc, @@ -257,12 +257,12 @@ * 五包上报 */ @FormUrlEncoded - @POST("/case/add") + @POST("/case/addAPP") Observable submitShopCase(@Header("token") String token, @Field("isNeedVerify") String isNeedVerify, @Field("isNeedRevisit") String isNeedRevisit, - @Field("longitude") String longitude, - @Field("latitude") String latitude, + @Field("lng") String longitude, + @Field("lat") String latitude, @Field("source") String source, @Field("caseLevel") String caseLevel, @Field("areaCode") String areaCode, 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 9cdf5a1..0412275 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,5 +1,7 @@ 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; @@ -63,7 +65,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/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index adb7b93..4f3a899 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -130,7 +130,6 @@ @@ -149,6 +148,7 @@ + +