From 4230457ee9edca6af738ec3f832ed0f49d0d99c3 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 04 十二月 2024 18:10:30 +0800
Subject: [PATCH] 1.下载地图瓦片判断是否有网。 2.没有上传成功的巡检坐标有网时重新上传。 3.添加网络判断的工具类
---
app/src/main/java/com/dayu/pipirrapp/net/MyIntercepterApplication.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/net/MyIntercepterApplication.java b/app/src/main/java/com/dayu/pipirrapp/net/MyIntercepterApplication.java
index bc2fba6..32f133b 100644
--- a/app/src/main/java/com/dayu/pipirrapp/net/MyIntercepterApplication.java
+++ b/app/src/main/java/com/dayu/pipirrapp/net/MyIntercepterApplication.java
@@ -1,11 +1,10 @@
package com.dayu.pipirrapp.net;
-import com.dayu.pipirrapp.MyApplication;
-import com.dayu.pipirrapp.utils.CommonData;
-import com.dayu.pipirrapp.utils.SharedPreferencesHelper;
-import com.dayu.pipirrapp.utils.ToastUtil;
-import com.tencent.bugly.crashreport.CrashReport;
+import android.text.TextUtils;
+import com.dayu.pipirrapp.MyApplication;
+import com.dayu.pipirrapp.utils.NetUtils;
+import com.tencent.bugly.crashreport.CrashReport;
import java.io.IOException;
import java.net.ConnectException;
@@ -31,9 +30,8 @@
public Response intercept(Chain chain) throws IOException {
Request request = chain.request();
try {
-
- Request myRequest = createRequest(chain.request());
- if (myRequest != null) {
+ if (NetUtils.isNetworkAvailable(MyApplication.myApplication)) {
+ Request myRequest = createRequest(chain.request());
Response response = null;
try {
response = chain.proceed(myRequest);
@@ -43,7 +41,8 @@
}
return response;
} else {
- ToastUtil.showToastLong(MyApplication.myApplication, "璇锋鏌ョ綉缁滆繛鎺�!!");
+ return getNullResponse(request);
+
}
} catch (Exception e) {
e.printStackTrace();
@@ -68,7 +67,10 @@
}
}
builder.addHeader("os", "app");
- builder.addHeader("Authorization", SharedPreferencesHelper.getInstance(MyApplication.myApplication).get("token", ""));
+ if (!TextUtils.isEmpty(MyApplication.myApplication.token)) {
+ builder.addHeader("token", MyApplication.myApplication.token);
+ }
+
}
builder.addHeader("tag", MyApplication.myApplication.myTag);
return builder.build();
@@ -89,7 +91,7 @@
public Response getNullResponse(Request request) {
int code = 20010;
String message = "鍜︼紝璇锋鏌ョ綉缁�";
- String errJson = "{\"code\":" + code + ",\"message\":\"" + message + "\"}";
+ String errJson = "{\"code\":" + code + ",\"msg\":\"" + message + "\"}";
Response.Builder builder = new Response.Builder().body(ResponseBody.create(MediaType.parse("application/json"), errJson));
builder.request(request);
builder.protocol(Protocol.HTTP_1_1);
--
Gitblit v1.8.0