From 21e38bfe17d3077d7ab0e05ee065f59547536692 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 03 十二月 2024 10:33:19 +0800
Subject: [PATCH] 1.添加当前巡检状态的功能。 2.修复工单界面刷新已完成列表导致未完成列表数据被清除的bug
---
app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java | 131 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 117 insertions(+), 14 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 9bf38c8..8e03e6f 100644
--- a/app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java
+++ b/app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java
@@ -1,14 +1,21 @@
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;
@@ -21,9 +28,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;
/**
@@ -77,6 +88,9 @@
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);
+ }
/**
* 鍙戦�佽姹�
@@ -97,10 +111,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);
@@ -182,21 +195,27 @@
/**
* 鑾峰彇楠岃瘉鐮�
+ *
* @param params
* @param listener
* @param <T>
*/
- public <T> void getCode( Map<String, Object> params, CodeListener listener) {
- 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);
- });
+ public <T> void getCode(Map<String, Object> params, CodeListener listener) {
+ if (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);
+ }
+
}
@@ -241,4 +260,88 @@
}
}
+ /**
+ * 鍒ゆ柇褰撳墠鏄惁鏈夌綉缁�
+ *
+ * @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 listener
+ */
+ public void uploadFile(final Context context, final UplodFileState file, 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>() {
+ @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);
+ }
+ }
+ }
+ }
+
+ @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);
+ }
+ }
+ });
+ }
+
+
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0