From 798128053bb17ed293aa8d5424db3b5ed007d375 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 23 十二月 2024 10:20:57 +0800
Subject: [PATCH] 1.优化订单列表框架，升级为viewPager2，提升性能。 2.添加收到新工单后的红点提醒。 3.修复查询数据为空时报错。 4.优化修改经纬度的流程。 5.修复mqtt的CLIENT_ID一致导致的连接错误。 6.修复收到新工单后点击消息通知栏跳转详情时不更新数据的bug。
---
app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java | 198 ++++++++++++++++++++++++++++---------------------
1 files changed, 112 insertions(+), 86 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..1dc81ef 100644
--- a/app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java
+++ b/app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java
@@ -1,13 +1,14 @@
package com.dayu.pipirrapp.net;
+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.util.Log;
import com.dayu.pipirrapp.MyApplication;
+import com.dayu.pipirrapp.activity.LoginActivity;
import com.dayu.pipirrapp.bean.net.CodeResult;
import com.dayu.pipirrapp.bean.net.UplodFileState;
import com.dayu.pipirrapp.bean.net.WeatherResponse;
@@ -15,10 +16,18 @@
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.ProgressListener;
+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 com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
+import java.io.File;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -88,6 +97,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,6 +136,12 @@
public BaseResponse<T> apply(Object o) {
if (o instanceof BaseResponse) {
BaseResponse tem = (BaseResponse) o;
+ if (tem.getCode().equals("0000")) {
+ //褰揷ode涓�0000鏄烦杞埌鐧诲綍鐣岄潰
+ tem.setMsg("鐧诲綍澶辨晥璇烽噸鏂扮櫥褰�");
+ redirectToLogin();
+ return tem;
+ }
BaseResponse<T> response = new BaseResponse<>();
response.setCode(tem.getCode());
response.setMsg(tem.getMsg());
@@ -174,6 +190,8 @@
}
}
+
+
/**
* 鑾峰彇澶╂皵
*
@@ -201,7 +219,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 +242,32 @@
*
* @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
+ .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);
+ }
}
// 鍋滄绾跨▼姹狅紝閲婃斁璧勬簮
@@ -260,69 +277,51 @@
}
}
- /**
- * 鍒ゆ柇褰撳墠鏄惁鏈夌綉缁�
- *
- * @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; // 鏃犵綉缁滆繛鎺�
- }
/**
* 涓婁紶鏂囦欢
*
* @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) {
- // 鍒涘缓 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>() {
+ File file = new File(uplodData.getFilePath());
+ RequestBody requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
+ ProgressRequestBody progressRequestBody = new ProgressRequestBody(requestBody, new ProgressListener() {
+ @Override
+ public void onProgress(long bytesWritten, long contentLength, boolean done) {
+ // 鏇存柊杩涘害鏉℃垨杩涜鍏朵粬鎿嶄綔
+ int progress = (int) (100 * bytesWritten / contentLength);
+ // 渚嬪锛氭洿鏂� ProgressBar 鎴栨樉绀鸿繘搴�
+ runOnUiThread(() -> {
+ // 杩涘害鏉℃洿鏂颁唬鐮�
+ // progressBar.setProgress(progress);
+ MyLog.d("progressRequestBody>>>" + "涓婁紶杩涘害: " + progress + "%");
+ });
+ }
+ });
+ MultipartBody.Part body = MultipartBody.Part.createFormData("file", file.getName(), progressRequestBody);
+ RequestBody description = RequestBody.create(MediaType.parse("text/plain"), "file description");
+ Call<BaseResponse> uploadFile = apiService.uploadFile(body, description);
+ uplodData.setThisCall(uploadFile);
+ uploadFile.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);
+ uplodData.setState(1);
+ uplodData.setId(((LinkedTreeMap) response.body().getContent()).get("id").toString());
+ uplodData.setWebPath(((LinkedTreeMap) response.body().getContent()).get("webPath").toString());
+ listener.onBack(uplodData);
} else {
- if (file.getNumber() <= uplodFilerepeatSize) {
- file.setNumber(file.getNumber() + 1);
- file.setState(2);
- uploadFile(context, file, listener);
+ if (uplodData.getNumber() <= uplodFilerepeatSize) {
+ uplodData.setNumber(uplodData.getNumber() + 1);
+ uplodData.setState(2);
+ uploadFile(context, uplodData, listener);
} else {
- listener.onBack(file);
+ listener.onBack(uplodData);
}
}
}
@@ -330,18 +329,45 @@
@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);
+ if (uplodData.getNumber() <= uplodFilerepeatSize) {
+ uplodData.setNumber(uplodData.getNumber() + 1);
+ uplodData.setState(2);
+ uploadFile(context, uplodData, listener);
} else {
- listener.onBack(file);
+ listener.onBack(uplodData);
}
}
});
+
}
+ /**
+ * 鍒ゆ柇褰撳墠code鏄惁鏄湭鐧诲綍鐘舵��
+ *
+ * @param responseBody the response body in JSON format
+ * @return true if login is required, false otherwise
+ */
+ private boolean isLoginRequired(String responseBody) {
+ try {
+ Gson gson = new Gson();
+ Map<String, Object> responseMap = gson.fromJson(responseBody, Map.class);
+ String code = (String) responseMap.get("code");
+ return "0000".equals(code); // Check if the code is not 0000
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return false;
+ }
+ /**
+ * 褰揷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