From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
index 13d1843..075d3db 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
@@ -69,7 +69,8 @@
public static HDLException getException(HDLException e) {
try {
- return new HDLException(e.getCode(), getErrorSting(e.getCode()), e.getmExtra());
+ String str = TextUtils.isEmpty(getErrorSting(e.getCode())) ? e.getMsg() : getErrorSting(e.getCode());
+ return new HDLException(e.getCode(), str, e.getmExtra());
} catch (Exception exception) {
return e;
}
@@ -79,7 +80,7 @@
try {
switch (code) {
case 1000:
- return HDLApp.getInstance().getAppLocaleContext().getString(R.string.http_unknown);
+ return HDLApp.getInstance().getAppLocaleContext().getString(R.string.no_network_connection);
case 1001:
return HDLApp.getInstance().getAppLocaleContext().getString(R.string.parse_error);
case 1002:
@@ -89,6 +90,8 @@
return HDLApp.getInstance().getAppLocaleContext().getString(R.string.ssl_error);
case 1005:
return HDLApp.getInstance().getAppLocaleContext().getString(R.string.timeout_error);
+ case 4:
+ return HDLApp.getInstance().getAppLocaleContext().getString(R.string.signature_error_log_in_again);
}
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.8.0