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/ApiManager.java | 125 ++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 51 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java b/app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java
index 0735ae5..dc7a736 100644
--- a/app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java
+++ b/app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java
@@ -1,21 +1,20 @@
package com.dayu.pipirrapp.net;
import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.os.Build;
import android.util.Log;
import com.dayu.pipirrapp.MyApplication;
import com.dayu.pipirrapp.bean.net.CodeResult;
+import com.dayu.pipirrapp.bean.net.UplodFileState;
import com.dayu.pipirrapp.bean.net.WeatherResponse;
import com.dayu.pipirrapp.net.subscribers.BaseProgressSubscriber;
import com.dayu.pipirrapp.net.subscribers.CodeListener;
import com.dayu.pipirrapp.net.subscribers.ProgressSubscriber;
import com.dayu.pipirrapp.net.subscribers.SubscriberListener;
+import com.dayu.pipirrapp.net.upload.UploadFileListener;
import com.dayu.pipirrapp.utils.MapJpgUtils;
import com.dayu.pipirrapp.utils.MyJsonParser;
+import com.dayu.pipirrapp.utils.NetUtils;
import java.util.HashMap;
import java.util.List;
@@ -26,9 +25,13 @@
import io.reactivex.rxjava3.disposables.CompositeDisposable;
import io.reactivex.rxjava3.functions.Function;
import io.reactivex.rxjava3.schedulers.Schedulers;
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
import okhttp3.ResponseBody;
import retrofit2.Call;
import retrofit2.Callback;
+import retrofit2.Response;
/**
@@ -82,6 +85,7 @@
public <T> void requestGet(final Context context, final String path, final Class<T> tClass, final Map<String, Object> params, final SubscriberListener listener) {
request(context, false, path, true, tClass, params, listener);
}
+
public <T> void requestGetHideLoading(final Context context, final String path, final Class<T> tClass, final Map<String, Object> params, final SubscriberListener listener) {
request(context, true, path, true, tClass, params, listener);
}
@@ -195,7 +199,7 @@
* @param <T>
*/
public <T> void getCode(Map<String, Object> params, CodeListener listener) {
- if (isNetworkAvailable(MyApplication.myApplication)) {
+ if (NetUtils.isNetworkAvailable(MyApplication.myApplication)) {
Observable observable;
observable = apiService.getCode(params);
observable.subscribeOn(Schedulers.io())
@@ -218,33 +222,31 @@
*
* @param urlPath
*/
- public void donwLoadTile(String urlPath) {
- Observable<ResponseBody> observable;
- observable = apiService.downloadTile(urlPath);
+ public void donwLoadTile(Context context, String urlPath) {
+ if (NetUtils.isNetworkAvailable(context)) {
+ Observable<ResponseBody> observable;
+ observable = apiService.downloadTile(urlPath);
+ observable
+ .subscribeOn(Schedulers.io()) // 缃戠粶璇锋眰鍦� I/O 绾跨▼涓繘琛�
+ .observeOn(Schedulers.io()) // 鍥炶皟澶勭悊涔熷湪 I/O 绾跨▼
+ .subscribe(
+ responseBody -> {
-
-// compositeDisposable.add(
- observable
- .subscribeOn(Schedulers.io()) // 缃戠粶璇锋眰鍦� I/O 绾跨▼涓繘琛�
- .observeOn(Schedulers.io()) // 鍥炶皟澶勭悊涔熷湪 I/O 绾跨▼
- .subscribe(
- responseBody -> {
-
- boolean success = false;
- if (!MapJpgUtils.getInsatance().isHasFiles(urlPath)) {
- success = MapJpgUtils.getInsatance().saveTileToCache(urlPath, responseBody);
- }
- if (success) {
- Log.d(TAG, "Download success for tile: " + urlPath);
- } else {
- Log.e(TAG, "Failed to save tile to disk: " + urlPath);
- }
- },
- throwable -> Log.e(TAG, "Download failed for tile: " + urlPath)
- );
-// );
-
-
+ boolean success = false;
+ if (!MapJpgUtils.getInsatance().isHasFiles(urlPath)) {
+ success = MapJpgUtils.getInsatance().saveTileToCache(urlPath, responseBody);
+ }
+ if (success) {
+ Log.d(TAG, "Download success for tile: " + urlPath);
+ } else {
+ Log.e(TAG, "Failed to save tile to disk: " + urlPath);
+ }
+ },
+ throwable -> Log.e(TAG, "Download failed for tile: " + urlPath)
+ );
+ } else {
+ Log.e(TAG, "娌℃湁缃戠粶涓嶄笅杞�: " + urlPath);
+ }
}
// 鍋滄绾跨▼姹狅紝閲婃斁璧勬簮
@@ -254,35 +256,56 @@
}
}
+
/**
- * 鍒ゆ柇褰撳墠鏄惁鏈夌綉缁�
+ * 涓婁紶鏂囦欢
*
* @param context
- * @return
+ * @param file
+ * @param listener
*/
- public boolean isNetworkAvailable(Context context) {
- ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+ public void uploadFile(final Context context, final UplodFileState file, final UploadFileListener listener) {
- if (connectivityManager != null) {
- // 瀵逛簬 Android 鐗堟湰澶т簬绛変簬 Android Q (API level 29)
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
- NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(connectivityManager.getActiveNetwork());
- if (capabilities != null) {
- // 妫�鏌ョ綉缁滄槸鍚︽湁浼犺緭鑳藉姏锛堝寘鎷� Wi-Fi 鍜岀Щ鍔ㄦ暟鎹級
- if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
- return true;
+ // 鍒涘缓 RequestBody锛岀敤浜庡皝瑁呮瀯寤篟equestBody
+ RequestBody requestFile =
+ RequestBody.create(MediaType.parse("multipart/form-data"), file.getFile());
+ // MultipartBody.Part 鍜屽悗绔害瀹氬ソKey锛岃繖閲岀殑partName鏄敤image
+ MultipartBody.Part body = MultipartBody.Part.createFormData("file", file.getFile().getName(), requestFile);
+ // 娣诲姞鎻忚堪
+ String descriptionString = "hello, 杩欐槸鏂囦欢鎻忚堪";
+ RequestBody description = RequestBody.create(MediaType.parse("multipart/form-data"), descriptionString);
+ apiService.uploadFile(description, body).enqueue(new Callback<BaseResponse>() {
+ @Override
+ public void onResponse(Call<BaseResponse> call, Response<BaseResponse> response) {
+ if (response.body() != null) {
+ if (response.body().isSuccess()) {
+ file.setState(1);
+ file.setUrl(response.body().getMsg());
+ listener.onBack(file);
+ } else {
+ if (file.getNumber() <= uplodFilerepeatSize) {
+ file.setNumber(file.getNumber() + 1);
+ file.setState(2);
+ uploadFile(context, file, listener);
+ } else {
+ listener.onBack(file);
+ }
}
}
- } else {
- // 瀵逛簬 Android Q 浠ヤ笅鐗堟湰
- NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
- if (activeNetworkInfo != null && activeNetworkInfo.isConnected()) {
- return true;
+ }
+
+ @Override
+ public void onFailure(Call<BaseResponse> call, Throwable t) {
+ if (file.getNumber() <= uplodFilerepeatSize) {
+ file.setNumber(file.getNumber() + 1);
+ file.setState(2);
+ uploadFile(context, file, listener);
+ } else {
+ listener.onBack(file);
}
}
- }
-
- return false; // 鏃犵綉缁滆繛鎺�
+ });
}
+
}
\ No newline at end of file
--
Gitblit v1.8.0