diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 5fcdbce..d7b6aef 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -51,6 +51,7 @@ verifyActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -84,6 +85,7 @@ checkActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -117,6 +119,7 @@ overtimeActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,7 @@ shopActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -249,6 +253,7 @@ updateSuperviseActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -282,6 +287,7 @@ dispatcherHandleActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 5fcdbce..d7b6aef 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -51,6 +51,7 @@ verifyActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -84,6 +85,7 @@ checkActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -117,6 +119,7 @@ overtimeActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,7 @@ shopActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -249,6 +253,7 @@ updateSuperviseActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -282,6 +287,7 @@ dispatcherHandleActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 1786e1f..6ace09f 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -305,6 +305,7 @@ searchResultModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -405,6 +406,7 @@ caseDetailModel.setValue(detailBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 5fcdbce..d7b6aef 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -51,6 +51,7 @@ verifyActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -84,6 +85,7 @@ checkActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -117,6 +119,7 @@ overtimeActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,7 @@ shopActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -249,6 +253,7 @@ updateSuperviseActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -282,6 +287,7 @@ dispatcherHandleActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 1786e1f..6ace09f 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -305,6 +305,7 @@ searchResultModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -405,6 +406,7 @@ caseDetailModel.setValue(detailBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 76e77cb..5ad002d 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -174,6 +174,7 @@ caseProcessModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 5fcdbce..d7b6aef 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -51,6 +51,7 @@ verifyActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -84,6 +85,7 @@ checkActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -117,6 +119,7 @@ overtimeActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,7 @@ shopActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -249,6 +253,7 @@ updateSuperviseActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -282,6 +287,7 @@ dispatcherHandleActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 1786e1f..6ace09f 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -305,6 +305,7 @@ searchResultModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -405,6 +406,7 @@ caseDetailModel.setValue(detailBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 76e77cb..5ad002d 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -174,6 +174,7 @@ caseProcessModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 8742670..cba33fb 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -60,6 +60,7 @@ cityBaseData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -93,6 +94,7 @@ caseResourceData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -126,6 +128,7 @@ highEventModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -159,6 +162,7 @@ deptHandleConditionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -192,6 +196,7 @@ gridAnalysisData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -225,6 +230,7 @@ caseTendencyData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -258,6 +264,7 @@ typeStatisticData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 5fcdbce..d7b6aef 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -51,6 +51,7 @@ verifyActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -84,6 +85,7 @@ checkActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -117,6 +119,7 @@ overtimeActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,7 @@ shopActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -249,6 +253,7 @@ updateSuperviseActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -282,6 +287,7 @@ dispatcherHandleActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 1786e1f..6ace09f 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -305,6 +305,7 @@ searchResultModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -405,6 +406,7 @@ caseDetailModel.setValue(detailBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 76e77cb..5ad002d 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -174,6 +174,7 @@ caseProcessModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 8742670..cba33fb 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -60,6 +60,7 @@ cityBaseData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -93,6 +94,7 @@ caseResourceData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -126,6 +128,7 @@ highEventModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -159,6 +162,7 @@ deptHandleConditionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -192,6 +196,7 @@ gridAnalysisData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -225,6 +230,7 @@ caseTendencyData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -258,6 +264,7 @@ typeStatisticData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index b7abca4..4e37f76 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -45,6 +45,7 @@ deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 5fcdbce..d7b6aef 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -51,6 +51,7 @@ verifyActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -84,6 +85,7 @@ checkActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -117,6 +119,7 @@ overtimeActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,7 @@ shopActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -249,6 +253,7 @@ updateSuperviseActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -282,6 +287,7 @@ dispatcherHandleActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 1786e1f..6ace09f 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -305,6 +305,7 @@ searchResultModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -405,6 +406,7 @@ caseDetailModel.setValue(detailBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 76e77cb..5ad002d 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -174,6 +174,7 @@ caseProcessModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 8742670..cba33fb 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -60,6 +60,7 @@ cityBaseData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -93,6 +94,7 @@ caseResourceData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -126,6 +128,7 @@ highEventModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -159,6 +162,7 @@ deptHandleConditionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -192,6 +196,7 @@ gridAnalysisData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -225,6 +230,7 @@ caseTendencyData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -258,6 +264,7 @@ typeStatisticData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index b7abca4..4e37f76 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -45,6 +45,7 @@ deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 9c221d4..809a3b5 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -45,6 +45,7 @@ homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 5fcdbce..d7b6aef 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -51,6 +51,7 @@ verifyActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -84,6 +85,7 @@ checkActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -117,6 +119,7 @@ overtimeActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,7 @@ shopActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -249,6 +253,7 @@ updateSuperviseActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -282,6 +287,7 @@ dispatcherHandleActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 1786e1f..6ace09f 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -305,6 +305,7 @@ searchResultModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -405,6 +406,7 @@ caseDetailModel.setValue(detailBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 76e77cb..5ad002d 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -174,6 +174,7 @@ caseProcessModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 8742670..cba33fb 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -60,6 +60,7 @@ cityBaseData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -93,6 +94,7 @@ caseResourceData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -126,6 +128,7 @@ highEventModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -159,6 +162,7 @@ deptHandleConditionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -192,6 +196,7 @@ gridAnalysisData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -225,6 +230,7 @@ caseTendencyData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -258,6 +264,7 @@ typeStatisticData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index b7abca4..4e37f76 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -45,6 +45,7 @@ deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 9c221d4..809a3b5 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -45,6 +45,7 @@ homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 98dee29..5744d53 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -83,6 +83,7 @@ lightControlModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 5fcdbce..d7b6aef 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -51,6 +51,7 @@ verifyActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -84,6 +85,7 @@ checkActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -117,6 +119,7 @@ overtimeActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,7 @@ shopActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -249,6 +253,7 @@ updateSuperviseActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -282,6 +287,7 @@ dispatcherHandleActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 1786e1f..6ace09f 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -305,6 +305,7 @@ searchResultModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -405,6 +406,7 @@ caseDetailModel.setValue(detailBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 76e77cb..5ad002d 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -174,6 +174,7 @@ caseProcessModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 8742670..cba33fb 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -60,6 +60,7 @@ cityBaseData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -93,6 +94,7 @@ caseResourceData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -126,6 +128,7 @@ highEventModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -159,6 +162,7 @@ deptHandleConditionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -192,6 +196,7 @@ gridAnalysisData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -225,6 +230,7 @@ caseTendencyData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -258,6 +264,7 @@ typeStatisticData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index b7abca4..4e37f76 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -45,6 +45,7 @@ deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 9c221d4..809a3b5 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -45,6 +45,7 @@ homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 98dee29..5744d53 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -83,6 +83,7 @@ lightControlModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index e70ab22..7712b72 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -45,6 +45,7 @@ mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 5fcdbce..d7b6aef 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -51,6 +51,7 @@ verifyActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -84,6 +85,7 @@ checkActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -117,6 +119,7 @@ overtimeActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,7 @@ shopActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -249,6 +253,7 @@ updateSuperviseActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -282,6 +287,7 @@ dispatcherHandleActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 1786e1f..6ace09f 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -305,6 +305,7 @@ searchResultModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -405,6 +406,7 @@ caseDetailModel.setValue(detailBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 76e77cb..5ad002d 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -174,6 +174,7 @@ caseProcessModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 8742670..cba33fb 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -60,6 +60,7 @@ cityBaseData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -93,6 +94,7 @@ caseResourceData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -126,6 +128,7 @@ highEventModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -159,6 +162,7 @@ deptHandleConditionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -192,6 +196,7 @@ gridAnalysisData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -225,6 +230,7 @@ caseTendencyData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -258,6 +264,7 @@ typeStatisticData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index b7abca4..4e37f76 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -45,6 +45,7 @@ deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 9c221d4..809a3b5 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -45,6 +45,7 @@ homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 98dee29..5744d53 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -83,6 +83,7 @@ lightControlModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index e70ab22..7712b72 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -45,6 +45,7 @@ mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java index f69f5f5..fea703e 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -45,6 +45,7 @@ phoneBookModel.setValue(phoneBookBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 5fcdbce..d7b6aef 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -51,6 +51,7 @@ verifyActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -84,6 +85,7 @@ checkActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -117,6 +119,7 @@ overtimeActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,7 @@ shopActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -249,6 +253,7 @@ updateSuperviseActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -282,6 +287,7 @@ dispatcherHandleActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 1786e1f..6ace09f 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -305,6 +305,7 @@ searchResultModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -405,6 +406,7 @@ caseDetailModel.setValue(detailBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 76e77cb..5ad002d 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -174,6 +174,7 @@ caseProcessModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 8742670..cba33fb 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -60,6 +60,7 @@ cityBaseData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -93,6 +94,7 @@ caseResourceData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -126,6 +128,7 @@ highEventModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -159,6 +162,7 @@ deptHandleConditionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -192,6 +196,7 @@ gridAnalysisData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -225,6 +230,7 @@ caseTendencyData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -258,6 +264,7 @@ typeStatisticData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index b7abca4..4e37f76 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -45,6 +45,7 @@ deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 9c221d4..809a3b5 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -45,6 +45,7 @@ homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 98dee29..5744d53 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -83,6 +83,7 @@ lightControlModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index e70ab22..7712b72 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -45,6 +45,7 @@ mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java index f69f5f5..fea703e 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -45,6 +45,7 @@ phoneBookModel.setValue(phoneBookBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 4116423..4747237 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -46,6 +46,7 @@ changeResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 5fcdbce..d7b6aef 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -51,6 +51,7 @@ verifyActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -84,6 +85,7 @@ checkActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -117,6 +119,7 @@ overtimeActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,7 @@ shopActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -249,6 +253,7 @@ updateSuperviseActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -282,6 +287,7 @@ dispatcherHandleActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 1786e1f..6ace09f 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -305,6 +305,7 @@ searchResultModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -405,6 +406,7 @@ caseDetailModel.setValue(detailBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 76e77cb..5ad002d 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -174,6 +174,7 @@ caseProcessModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 8742670..cba33fb 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -60,6 +60,7 @@ cityBaseData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -93,6 +94,7 @@ caseResourceData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -126,6 +128,7 @@ highEventModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -159,6 +162,7 @@ deptHandleConditionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -192,6 +196,7 @@ gridAnalysisData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -225,6 +230,7 @@ caseTendencyData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -258,6 +264,7 @@ typeStatisticData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index b7abca4..4e37f76 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -45,6 +45,7 @@ deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 9c221d4..809a3b5 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -45,6 +45,7 @@ homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 98dee29..5744d53 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -83,6 +83,7 @@ lightControlModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index e70ab22..7712b72 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -45,6 +45,7 @@ mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java index f69f5f5..fea703e 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -45,6 +45,7 @@ phoneBookModel.setValue(phoneBookBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 4116423..4747237 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -46,6 +46,7 @@ changeResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java index 05ab157..ca2be61 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -80,6 +80,7 @@ cleanToiletModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -113,6 +114,7 @@ cleanRecordModel.setValue(listBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 5fcdbce..d7b6aef 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -51,6 +51,7 @@ verifyActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -84,6 +85,7 @@ checkActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -117,6 +119,7 @@ overtimeActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,7 @@ shopActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -249,6 +253,7 @@ updateSuperviseActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -282,6 +287,7 @@ dispatcherHandleActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 1786e1f..6ace09f 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -305,6 +305,7 @@ searchResultModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -405,6 +406,7 @@ caseDetailModel.setValue(detailBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 76e77cb..5ad002d 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -174,6 +174,7 @@ caseProcessModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 8742670..cba33fb 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -60,6 +60,7 @@ cityBaseData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -93,6 +94,7 @@ caseResourceData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -126,6 +128,7 @@ highEventModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -159,6 +162,7 @@ deptHandleConditionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -192,6 +196,7 @@ gridAnalysisData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -225,6 +230,7 @@ caseTendencyData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -258,6 +264,7 @@ typeStatisticData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index b7abca4..4e37f76 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -45,6 +45,7 @@ deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 9c221d4..809a3b5 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -45,6 +45,7 @@ homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 98dee29..5744d53 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -83,6 +83,7 @@ lightControlModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index e70ab22..7712b72 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -45,6 +45,7 @@ mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java index f69f5f5..fea703e 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -45,6 +45,7 @@ phoneBookModel.setValue(phoneBookBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 4116423..4747237 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -46,6 +46,7 @@ changeResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java index 05ab157..ca2be61 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -80,6 +80,7 @@ cleanToiletModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -113,6 +114,7 @@ cleanRecordModel.setValue(listBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java index efd1524..62a27d3 100644 --- a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java @@ -134,6 +134,7 @@ audioModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -167,6 +168,7 @@ videoModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 5fcdbce..d7b6aef 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -51,6 +51,7 @@ verifyActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -84,6 +85,7 @@ checkActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -117,6 +119,7 @@ overtimeActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,7 @@ shopActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -249,6 +253,7 @@ updateSuperviseActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -282,6 +287,7 @@ dispatcherHandleActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 1786e1f..6ace09f 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -305,6 +305,7 @@ searchResultModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -405,6 +406,7 @@ caseDetailModel.setValue(detailBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 76e77cb..5ad002d 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -174,6 +174,7 @@ caseProcessModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 8742670..cba33fb 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -60,6 +60,7 @@ cityBaseData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -93,6 +94,7 @@ caseResourceData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -126,6 +128,7 @@ highEventModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -159,6 +162,7 @@ deptHandleConditionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -192,6 +196,7 @@ gridAnalysisData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -225,6 +230,7 @@ caseTendencyData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -258,6 +264,7 @@ typeStatisticData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index b7abca4..4e37f76 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -45,6 +45,7 @@ deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 9c221d4..809a3b5 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -45,6 +45,7 @@ homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 98dee29..5744d53 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -83,6 +83,7 @@ lightControlModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index e70ab22..7712b72 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -45,6 +45,7 @@ mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java index f69f5f5..fea703e 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -45,6 +45,7 @@ phoneBookModel.setValue(phoneBookBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 4116423..4747237 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -46,6 +46,7 @@ changeResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java index 05ab157..ca2be61 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -80,6 +80,7 @@ cleanToiletModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -113,6 +114,7 @@ cleanRecordModel.setValue(listBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java index efd1524..62a27d3 100644 --- a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java @@ -134,6 +134,7 @@ audioModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -167,6 +168,7 @@ videoModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java index c8ccc99..d5f920e 100644 --- a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java @@ -22,6 +22,7 @@ import rx.Observable; public class UserViewModel extends BaseViewModel { + private static final String TAG = "UserViewModel"; private final Gson gson = new Gson(); public MutableLiveData userDataResult = new MutableLiveData<>(); public MutableLiveData loginResult = new MutableLiveData<>(); @@ -90,6 +91,7 @@ loginResult.setValue(loginResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -153,6 +155,7 @@ changePwdResult.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 5fcdbce..d7b6aef 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -51,6 +51,7 @@ verifyActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -84,6 +85,7 @@ checkActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -117,6 +119,7 @@ overtimeActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,7 @@ shopActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -249,6 +253,7 @@ updateSuperviseActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -282,6 +287,7 @@ dispatcherHandleActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 1786e1f..6ace09f 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -305,6 +305,7 @@ searchResultModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -405,6 +406,7 @@ caseDetailModel.setValue(detailBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 76e77cb..5ad002d 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -174,6 +174,7 @@ caseProcessModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 8742670..cba33fb 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -60,6 +60,7 @@ cityBaseData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -93,6 +94,7 @@ caseResourceData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -126,6 +128,7 @@ highEventModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -159,6 +162,7 @@ deptHandleConditionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -192,6 +196,7 @@ gridAnalysisData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -225,6 +230,7 @@ caseTendencyData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -258,6 +264,7 @@ typeStatisticData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index b7abca4..4e37f76 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -45,6 +45,7 @@ deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 9c221d4..809a3b5 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -45,6 +45,7 @@ homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 98dee29..5744d53 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -83,6 +83,7 @@ lightControlModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index e70ab22..7712b72 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -45,6 +45,7 @@ mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java index f69f5f5..fea703e 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -45,6 +45,7 @@ phoneBookModel.setValue(phoneBookBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 4116423..4747237 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -46,6 +46,7 @@ changeResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java index 05ab157..ca2be61 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -80,6 +80,7 @@ cleanToiletModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -113,6 +114,7 @@ cleanRecordModel.setValue(listBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java index efd1524..62a27d3 100644 --- a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java @@ -134,6 +134,7 @@ audioModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -167,6 +168,7 @@ videoModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java index c8ccc99..d5f920e 100644 --- a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java @@ -22,6 +22,7 @@ import rx.Observable; public class UserViewModel extends BaseViewModel { + private static final String TAG = "UserViewModel"; private final Gson gson = new Gson(); public MutableLiveData userDataResult = new MutableLiveData<>(); public MutableLiveData loginResult = new MutableLiveData<>(); @@ -90,6 +91,7 @@ loginResult.setValue(loginResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -153,6 +155,7 @@ changePwdResult.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java b/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java index 326e866..d453411 100644 --- a/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java @@ -46,6 +46,7 @@ versionModel.setValue(versionBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java new file mode 100644 index 0000000..f25a026 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java @@ -0,0 +1,49 @@ +package com.casic.dcms.model; + +public class ErrorMessageModel { + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean isSuccess; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return isSuccess; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 147b1d6..6e0d8ee 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,10 +4,13 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; +import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; import org.json.JSONException; @@ -185,6 +188,12 @@ return code; } + public static void showErrorMessage(String value) { + ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { + }.getType()); + StringHub.show(BaseApplication.get(), errorModel.getMessage()); + } + /** * 根据item名字获取icon */ diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index 7af9dec..02cffff 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -48,6 +48,7 @@ resultModel.setValue(alarmDataBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -114,6 +116,7 @@ cancelActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 051ce53..4ba0bcd 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -48,6 +48,7 @@ submitResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -81,6 +82,7 @@ recordModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 5fcdbce..d7b6aef 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -51,6 +51,7 @@ verifyActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -84,6 +85,7 @@ checkActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -117,6 +119,7 @@ overtimeActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,7 @@ shopActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -249,6 +253,7 @@ updateSuperviseActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -282,6 +287,7 @@ dispatcherHandleActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 1786e1f..6ace09f 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -305,6 +305,7 @@ searchResultModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -405,6 +406,7 @@ caseDetailModel.setValue(detailBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index 76e77cb..5ad002d 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -174,6 +174,7 @@ caseProcessModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 8742670..cba33fb 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -60,6 +60,7 @@ cityBaseData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -93,6 +94,7 @@ caseResourceData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -126,6 +128,7 @@ highEventModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -159,6 +162,7 @@ deptHandleConditionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -192,6 +196,7 @@ gridAnalysisData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -225,6 +230,7 @@ caseTendencyData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -258,6 +264,7 @@ typeStatisticData.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index b7abca4..4e37f76 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -45,6 +45,7 @@ deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 9c221d4..809a3b5 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -45,6 +45,7 @@ homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 98dee29..5744d53 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -83,6 +83,7 @@ lightControlModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index e70ab22..7712b72 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -45,6 +45,7 @@ mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java index f69f5f5..fea703e 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -45,6 +45,7 @@ phoneBookModel.setValue(phoneBookBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 4116423..4747237 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -46,6 +46,7 @@ changeResultModel.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java index 05ab157..ca2be61 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -80,6 +80,7 @@ cleanToiletModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -113,6 +114,7 @@ cleanRecordModel.setValue(listBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java index efd1524..62a27d3 100644 --- a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java @@ -134,6 +134,7 @@ audioModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -167,6 +168,7 @@ videoModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java index c8ccc99..d5f920e 100644 --- a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java @@ -22,6 +22,7 @@ import rx.Observable; public class UserViewModel extends BaseViewModel { + private static final String TAG = "UserViewModel"; private final Gson gson = new Gson(); public MutableLiveData userDataResult = new MutableLiveData<>(); public MutableLiveData loginResult = new MutableLiveData<>(); @@ -90,6 +91,7 @@ loginResult.setValue(loginResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -153,6 +155,7 @@ changePwdResult.setValue(actionResultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java b/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java index 326e866..d453411 100644 --- a/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java @@ -46,6 +46,7 @@ versionModel.setValue(versionBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/WellViewModel.java b/app/src/main/java/com/casic/dcms/vm/WellViewModel.java index 034d487..7bef8be 100644 --- a/app/src/main/java/com/casic/dcms/vm/WellViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/WellViewModel.java @@ -80,6 +80,7 @@ resultModel.setValue(detailBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -113,6 +114,7 @@ operationActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace(); @@ -146,6 +148,7 @@ operationActionModel.setValue(resultBean); } else { loadState.setValue(LoadState.Fail); + StringHelper.showErrorMessage(response); } } catch (IOException e) { e.printStackTrace();