From 4f7f99c6ea914bcd38de78bd8371be566026b905 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 26 二月 2025 15:54:14 +0800
Subject: [PATCH] -为按钮和列表项添加波纹效果，以获得更好的视觉反馈 -改进MapFragment中的底部布局动画 -在MapFragment中添加设备状态和RTU地址显示 -更新BaseListResult以支持泛型类型 -为设备数据添加IntakeListResult和IntakeResult -通过数据库支持增强标记位置更新功能 -添加电话拨号意图以分隔标记详细信息 -通过过期检查改进磁贴缓存 -添加问题报告的确认对话框 -更新登录活动以限制用户名长度 -为波纹效果和UI元素添加新颜色 -重构XML布局以使用新的波纹图 -改进MapFragment中的错误处理和用户反馈
---
app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java | 311 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 271 insertions(+), 40 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 186cf43..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,29 +1,43 @@
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.content.Intent;
+import android.text.TextUtils;
+import android.util.Log;
-
-import com.dayu.pipirrapp.bean.WeatherResponse;
+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.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.rxjava3.core.Observable;
-import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
import io.reactivex.rxjava3.functions.Function;
import io.reactivex.rxjava3.schedulers.Schedulers;
import okhttp3.MediaType;
@@ -43,11 +57,16 @@
*/
public class ApiManager {
+ static String TAG = "ApiManager";
+
static ApiManager apiManager;
//鏂囦欢涓婁紶澶辫触閲嶅娆℃暟
int uplodFilerepeatSize = 3;
+
ApiService apiService;
+ // 绠＄悊璁㈤槄浜嬩欢
+ private final CompositeDisposable compositeDisposable = new CompositeDisposable();
/**
* 鍒濆鍖栭�氫俊妗嗘灦
@@ -60,6 +79,7 @@
public ApiManager() {
apiService = RetrofitClient.getInstance().getApiService();
+
}
public static ApiManager getInstance() {
@@ -77,6 +97,14 @@
public <T> void requestPost(final Context context, final String path, final Class<T> tClass, final Map<String, Object> params, final SubscriberListener listener) {
request(context, false, path, false, tClass, params, listener);
+ }
+
+ 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);
}
/**
@@ -98,10 +126,9 @@
if (isGet) {
if (params == null) {
- observable = apiService.requestGet(path);
+ observable = apiService.requestGet(path, MyApplication.myApplication.token);
} else {
-
- observable = apiService.requestGet(path, params);
+ observable = apiService.requestGet(path, params, MyApplication.myApplication.token);
}
} else {
observable = apiService.requestPost(path, params);
@@ -114,37 +141,31 @@
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 (tClass != null && tem.getContent() instanceof Map) {
- try {
-// response.setData(MyJsonParser.getBeanFromMap((Map<String, Object>) tem.getData(), tClass));
- String jsonData = MyJsonParser.getJsontoMap((Map) tem.getContent());
- response.setContent(MyJsonParser.getBeanFromJson(jsonData, tClass));
- } catch (Exception e) {
- e.printStackTrace();
- }
- } else if (tClass != null && tem.getContent() instanceof List) {
- try {
- response.setContent((T) MyJsonParser.getListByJson(MyJsonParser.getJsonbyList((List) tem.getContent()), tClass));
- } catch (Exception e) {
- e.printStackTrace();
- }
- } else if (tClass != null && tem.getContent() instanceof Integer) {
- response.setContent((T) tem.getContent());
+ if (!TextUtils.isEmpty(tem.getMsg())) {
+ response.setMsg(tem.getMsg());
+ } else {
+ response.setMsg("");
}
- if (tClass != null && tClass.getName() instanceof String && tem.getContent() instanceof String) {
- try {
+
+
+ if (tClass != null) {
+ if (tem.getContent() instanceof Map) {
+ response.setContent(parseMapContent(tem.getContent(), tClass));
+ } else if (tem.getContent() instanceof List) {
+ response.setContent(parseListContent(tem.getContent(), tClass));
+ } else if (tem.getContent() instanceof Integer || tem.getContent() instanceof String) {
response.setContent((T) tem.getContent());
- } catch (Exception e) {
- e.printStackTrace();
}
}
return response;
-
-
}
return null;
@@ -157,14 +178,37 @@
}
+ // 瑙ｆ瀽 Map 绫诲瀷鐨勬暟鎹�
+ private <T> T parseMapContent(Object content, Class<T> tClass) {
+ try {
+ String jsonData = MyJsonParser.getJsontoMap((Map<String, Object>) content);
+ return MyJsonParser.getBeanFromJson(jsonData, tClass);
+ } catch (Exception e) {
+ Log.e(TAG, "Error parsing map content", e);
+ return null;
+ }
+ }
+
+ // 瑙ｆ瀽 List 绫诲瀷鐨勬暟鎹�
+ private <T> T parseListContent(Object content, Class<T> tClass) {
+ try {
+ String jsonData = MyJsonParser.getJsonbyList((List<?>) content);
+ return (T) MyJsonParser.getListByJson(jsonData, tClass);
+ } catch (Exception e) {
+ Log.e(TAG, "Error parsing list content", e);
+ return null;
+ }
+ }
+
/**
- * 鑾峰彇澶╂皵
- * @param data 缁忕含搴︼紙鏍煎紡鏄� 绾害:缁忓害锛岃嫳鏂囧啋鍙峰垎闅旓級
+ * 鑾峰彇澶╂皵
+ *
+ * @param data 缁忕含搴︼紙鏍煎紡鏄� 绾害:缁忓害锛岃嫳鏂囧啋鍙峰垎闅旓級
* @param callback
* @param <T>
*/
- public <T> void requestWeather(String data,Callback<WeatherResponse> callback) {
+ public <T> void requestWeather(String data, Callback<WeatherResponse> callback) {
Map<String, Object> params = new HashMap<>();
params.put("key", "S6Tq4pvOakMuWRrg0");
params.put("location", data);
@@ -176,4 +220,191 @@
}
+ /**
+ * 鑾峰彇楠岃瘉鐮�
+ *
+ * @param params
+ * @param listener
+ * @param <T>
+ */
+ public <T> void getCode(Map<String, Object> params, CodeListener listener) {
+ if (NetUtils.isNetworkAvailable(MyApplication.myApplication)) {
+ Observable observable;
+ observable = apiService.getCode(params);
+ observable.subscribeOn(Schedulers.io())
+ .unsubscribeOn(Schedulers.newThread())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(responseBody -> {
+ listener.onNext((CodeResult) responseBody);
+ }, throwable -> {
+ listener.error((Throwable) throwable);
+ });
+ } else {
+ listener.onNext(null);
+ }
+
+ }
+
+
+ /**
+ * 涓嬭浇鍦板浘鐡︾墖
+ *
+ * @param 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 -> {
+
+ 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);
+ }
+ }
+
+ // 鍋滄绾跨▼姹狅紝閲婃斁璧勬簮
+ public void clearDisposables() {
+ if (!compositeDisposable.isDisposed()) {
+ compositeDisposable.dispose();
+ }
+ }
+
+
+// public void uploadFile(final Context context, final UplodFileState uplodData, final UploadFileListener listener) {
+// uploadFile(context, uplodData, listener, null);
+// }
+
+ /**
+ * 涓婁紶鍥剧墖鏂囦欢
+ *
+ * @param context
+ * @param uplodData
+ * @param listener
+ */
+ public void uploadFile(final Context context, final UplodFileState uplodData, final UploadFileListener listener, final AddPictureAdapter adapter) {
+
+ 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 {
+ 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<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