From e5a090685df3d5e96a37b141d9a1d002d36f16f2 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 14 二月 2025 16:53:43 +0800
Subject: [PATCH] 1.web地图添加管网显示。 2.安卓原生添加管网信息的获取。 3.安卓原生添加管网信息的本地持久化（SQLite数据库）。 4.实现图例用户的选择状态按钮的持久化。 5.实现自定义搜索按钮的实现。 6.实现搜索后弹出界面的相关功能开发。
---
app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java | 261 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 162 insertions(+), 99 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 8e03e6f..e21da6e 100644
--- a/app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java
+++ b/app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java
@@ -1,24 +1,36 @@
package com.dayu.pipirrapp.net;
+import static com.dayu.pipirrapp.bean.net.UplodFileState.STATE_DONE;
+import static com.dayu.pipirrapp.bean.net.UplodFileState.STATE_ERROR;
+import static com.dayu.pipirrapp.bean.net.UplodFileState.STATE_UPDING;
+import static com.luck.picture.lib.thread.PictureThreadUtils.runOnUiThread;
+
+import android.annotation.SuppressLint;
import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.os.Build;
+import android.content.Intent;
+import android.text.TextUtils;
import android.util.Log;
import com.dayu.pipirrapp.MyApplication;
+import com.dayu.pipirrapp.activity.LoginActivity;
+import com.dayu.pipirrapp.adapter.AddPictureAdapter;
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.bean.net.UploadFileResult;
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.ProgressRequestBody;
import com.dayu.pipirrapp.net.upload.UploadFileListener;
+import com.dayu.pipirrapp.utils.CleanDataUtils;
import com.dayu.pipirrapp.utils.MapJpgUtils;
import com.dayu.pipirrapp.utils.MyJsonParser;
+import com.dayu.pipirrapp.utils.MyLog;
+import com.dayu.pipirrapp.utils.NetUtils;
+import java.io.File;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -51,8 +63,10 @@
//鏂囦欢涓婁紶澶辫触閲嶅娆℃暟
int uplodFilerepeatSize = 3;
+
ApiService apiService;
- private CompositeDisposable compositeDisposable = new CompositeDisposable(); // 绠＄悊璁㈤槄浜嬩欢
+ // 绠＄悊璁㈤槄浜嬩欢
+ private final CompositeDisposable compositeDisposable = new CompositeDisposable();
/**
* 鍒濆鍖栭�氫俊妗嗘灦
@@ -88,6 +102,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);
}
@@ -126,9 +141,20 @@
public BaseResponse<T> apply(Object o) {
if (o instanceof BaseResponse) {
BaseResponse tem = (BaseResponse) o;
+ if (tem.getCode().equals(Constants.TOKEN_INVALID)) {
+ //褰揷ode涓�0000鏄烦杞埌鐧诲綍鐣岄潰
+ tem.setMsg("鐧诲綍澶辨晥璇烽噸鏂扮櫥褰�");
+ redirectToLogin();
+ return tem;
+ }
BaseResponse<T> response = new BaseResponse<>();
response.setCode(tem.getCode());
- response.setMsg(tem.getMsg());
+ if (!TextUtils.isEmpty(tem.getMsg())) {
+ response.setMsg(tem.getMsg());
+ } else {
+ response.setMsg("");
+ }
+
if (tClass != null) {
if (tem.getContent() instanceof Map) {
@@ -174,6 +200,7 @@
}
}
+
/**
* 鑾峰彇澶╂皵
*
@@ -201,7 +228,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())
@@ -224,33 +251,34 @@
*
* @param urlPath
*/
- public void donwLoadTile(String urlPath) {
- Observable<ResponseBody> observable;
- observable = apiService.downloadTile(urlPath);
+ @SuppressLint("CheckResult")
+ public void donwLoadTile(Context context, String urlPath) {
+ if (NetUtils.isNetworkAvailable(context)) {
+ Observable<ResponseBody> observable;
+ observable = apiService.downloadTile(urlPath);
+ observable
+ // 缃戠粶璇锋眰鍦� I/O 绾跨▼涓繘琛�
+ .subscribeOn(Schedulers.io())
+ // 鍥炶皟澶勭悊涔熷湪 I/O 绾跨▼
+ .observeOn(Schedulers.io())
+ .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);
+ }
}
// 鍋滄绾跨▼姹狅紝閲婃斁璧勬簮
@@ -260,88 +288,123 @@
}
}
- /**
- * 鍒ゆ柇褰撳墠鏄惁鏈夌綉缁�
- *
- * @param context
- * @return
- */
- public boolean isNetworkAvailable(Context context) {
- ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
- 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;
- }
- }
- } else {
- // 瀵逛簬 Android Q 浠ヤ笅鐗堟湰
- NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
- if (activeNetworkInfo != null && activeNetworkInfo.isConnected()) {
- return true;
- }
- }
- }
-
- return false; // 鏃犵綉缁滆繛鎺�
- }
+// public void uploadFile(final Context context, final UplodFileState uplodData, final UploadFileListener listener) {
+// uploadFile(context, uplodData, listener, null);
+// }
/**
- * 涓婁紶鏂囦欢
+ * 涓婁紶鍥剧墖鏂囦欢
*
* @param context
- * @param file
+ * @param uplodData
* @param listener
*/
- public void uploadFile(final Context context, final UplodFileState file, final UploadFileListener listener) {
+ public void uploadFile(final Context context, final UplodFileState uplodData, final UploadFileListener listener, final AddPictureAdapter adapter) {
- // 鍒涘缓 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);
+ if (!TextUtils.isEmpty(uplodData.getFilePath())) {
+ MyLog.d("progressRequestBody_uploadFile>>>" + "path:" + uplodData.getFilePath() + ">>>uploadType:" + uplodData.getUploadType());
+ uplodData.setState(STATE_UPDING);
+ File file = new File(uplodData.getFilePath());
+ RequestBody requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
+ ProgressRequestBody progressRequestBody = new ProgressRequestBody(requestBody, (bytesWritten, contentLength, done) -> {
+// MyLog.d("progressRequestBody>>>" + "bytesWritten:" + bytesWritten + ">>>contentLength: " + contentLength );
+ // 鏇存柊杩涘害鏉℃垨杩涜鍏朵粬鎿嶄綔
+ int progress = (int) (100 * bytesWritten / contentLength);
+ // 渚嬪锛氭洿鏂� ProgressBar 鎴栨樉绀鸿繘搴�
+ runOnUiThread(() -> {
+ if (progress <5) {
+ uplodData.setProgress(0);
+ }
+ // 杩涘害鏉℃洿鏂颁唬鐮�
+ if (adapter != null && uplodData.getAdapterPosition() != -1) {
+ //浼樺寲涓嶉绻佹洿鏂拌繘搴�
+ if (progress - uplodData.getProgress() > 5 || progress == 100) {
+ uplodData.setProgress(progress);
+ adapter.updateProgress(uplodData);
+
+ }
+
+ }
+ MyLog.d("progressRequestBodyHolder>>>path" + "adapterPosition:" + uplodData.getAdapterPosition() + ">>>涓婁紶杩涘害: " + progress + "%");
+ });
+
+ });
+ MultipartBody.Part body = MultipartBody.Part.createFormData("file", file.getName(), progressRequestBody);
+ RequestBody description = RequestBody.create(MediaType.parse("text/plain"), "file description");
+ Call<BaseResponse<UploadFileResult>> uploadFile = null;
+ switch (uplodData.getUploadType()) {
+ case UplodFileState.IMG_TYPE:
+ uploadFile = apiService.uploadImgFile(body, description);
+ break;
+ case UplodFileState.VIDEO_TYPE:
+ uploadFile = apiService.uploadVideoFile(body, description);
+ break;
+ default:
+ uploadFile = apiService.uploadImgFile(body, description);
+ break;
+ }
+
+ uplodData.setThisCall(uploadFile);
+ uploadFile.enqueue(new Callback<BaseResponse<UploadFileResult>>() {
+ @Override
+ public void onResponse(Call<BaseResponse<UploadFileResult>> call, Response<BaseResponse<UploadFileResult>> response) {
+ if (response.body() != null) {
+ if (response.body().isSuccess()) {
+ UploadFileResult uploadFileResult=response.body().getContent();
+ uplodData.setState(STATE_DONE);
+ uplodData.setPostId(uploadFileResult.getId());
+ uplodData.setUoloadFilePath(uploadFileResult.getFilePath());
+ uplodData.setHash(uploadFileResult.getHash());
+ uplodData.setWebPathZip(uploadFileResult.getWebPathZip());
+ listener.onBack(uplodData);
} else {
- listener.onBack(file);
+ MyLog.d("progressRequestBody>>>" + response.body().getMsg());
+ if (uplodData.getNumber() <= uplodFilerepeatSize) {
+ uplodData.setNumber(uplodData.getNumber() + 1);
+ uplodData.setState(STATE_ERROR);
+ uploadFile(context, uplodData, listener, adapter);
+ } else {
+ uplodData.setState(STATE_ERROR);
+ uplodData.setNumber(0);
+ listener.onBack(uplodData);
+ }
}
}
}
- }
- @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);
+ @Override
+ public void onFailure(Call<BaseResponse<UploadFileResult>> call, Throwable t) {
+ MyLog.d("progressRequestBody>>>" + "onFailure:" + t.getMessage());
+ if (!t.getMessage().equals("Canceled")) {
+ uplodData.setState(STATE_ERROR);
+ if (uplodData.getNumber() <= uplodFilerepeatSize) {
+ uplodData.setNumber(uplodData.getNumber() + 1);
+ uploadFile(context, uplodData, listener, adapter);
+ } else {
+ uplodData.setNumber(0);
+ listener.onBack(uplodData);
+ }
+ }
+
}
- }
- });
+ });
+ } else {
+ uplodData.setState(STATE_ERROR);
+ listener.onBack(uplodData);
+ }
}
+ /**
+ * 褰揷ode涓衡��0000鈥濇椂璺宠浆鍒扮櫥褰曠晫闈�
+ */
+ private void redirectToLogin() {
-
+ Context context = MyApplication.myApplication.getApplicationContext();
+ CleanDataUtils.cleanUserData(context);
+ Intent intent = new Intent(context, LoginActivity.class); // Assuming LoginActivity is your login screen
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); // Clear task stack
+ context.startActivity(intent);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0