From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java | 5 +++--
1 files changed, 3 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..f12c73f 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 msg = TextUtils.isEmpty(getErrorSting(e.getCode())) ? e.getMsg() : getErrorSting(e.getCode());
+ return new HDLException(e.getCode(), msg, 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:
--
Gitblit v1.8.0