From 7abba6f97f341700f671bfce6e8224b787dd7f98 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期五, 24 七月 2026 15:17:55 +0800
Subject: [PATCH] 修复问题
---
app/src/main/java/com/driver/igotrip/netUtls/MyObserver.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/driver/igotrip/netUtls/MyObserver.java b/app/src/main/java/com/driver/igotrip/netUtls/MyObserver.java
index cbb1f40..6a33d07 100644
--- a/app/src/main/java/com/driver/igotrip/netUtls/MyObserver.java
+++ b/app/src/main/java/com/driver/igotrip/netUtls/MyObserver.java
@@ -6,7 +6,6 @@
import android.text.TextUtils;
import android.util.Log;
-import com.driver.igotrip.R;
import com.driver.igotrip.base.BaseEvent;
import com.driver.igotrip.base.MyApplication;
import com.driver.igotrip.ui.pub.LoginActivity;
@@ -25,6 +24,7 @@
import cn.sinata.rxnetty.NettyClient;
import cn.sinata.xldutils.activitys.BaseActivity;
import cn.sinata.xldutils.fragment.BaseFragment;
+import cn.sinata.xldutils.net.utils.Error;
import cn.sinata.xldutils.net.utils.ResultException;
import cn.sinata.xldutils.utils.StringUtils;
import cn.sinata.xldutils.utils.Toast;
@@ -46,13 +46,6 @@
WeakReference<BaseActivity> activities;
WeakReference<BaseFragment> fragments;
Context context;
-
- public static final String REQUEST_ERROR = "请求出错！";
- public static final String PARSER_ERROR = "数据解析出错！";
- public static final String SERVER_ERROR = "服务器异常，请稍后重试！";
- public static final String NET_ERROR = "未连接到服务器！";
- public static final String NET_TIMEOUT = "链接超时，请稍后再试！";
-
public MyObserver(BaseActivity activity) {
activities = new WeakReference<>(activity);
@@ -87,7 +80,7 @@
LogUtils.e("responseString", "**" + responseString);
if (StringUtils.isEmpty(responseString)) { //判空
int code = -1;
- String msg = PARSER_ERROR;
+ String msg = getShowErrorMsg(Error.PARSER_ERROR);
onError(code, msg, responseString);
return;
}
@@ -123,17 +116,17 @@
Utils.systemErr(e);
Log.e("responseString", "responseString get " + e.toString());
int code = -1;
- String msg = context.getString(R.string.请求出错);
+ String msg = getShowErrorMsg(Error.REQUEST_ERROR);
if (e instanceof JsonSyntaxException ||
e instanceof NumberFormatException ||
e instanceof IllegalStateException) {
- msg = PARSER_ERROR;
+ msg = getShowErrorMsg(Error.PARSER_ERROR);
} else if (e instanceof HttpException) {
- msg = SERVER_ERROR;
+ msg = getShowErrorMsg(Error.SERVER_ERROR);
} else if (e instanceof ConnectException) {
- msg = NET_ERROR;
+ msg = getShowErrorMsg(Error.NET_ERROR);
} else if (e instanceof SocketTimeoutException) {
- msg = NET_TIMEOUT;
+ msg = getShowErrorMsg(Error.NET_TIMEOUT);
} else if (e instanceof ResultException) {
code = ((ResultException) e).getCode();
msg = e.getMessage();
@@ -167,7 +160,7 @@
* @param s 提示文字
*/
protected void showToast(String s) {
- if(TextUtils.isEmpty(s)){
+ if (TextUtils.isEmpty(s)) {
return;
}
Toast.create(context).show(s);
@@ -214,4 +207,16 @@
public void dispose() {
}
+
+ /**
+ * 获取异常显示信息
+ */
+ public String getShowErrorMsg(Error error) {
+ int typeByLanguage = HttpManager.getTypeByLanguage();
+ return switch (typeByLanguage) {
+ case 3 -> error.getErrorFr();
+ case 1 -> error.getErrorCh();
+ default -> error.getErrorEn();
+ };
+ }
}
--
Gitblit v1.7.1