From 94c235c116ebca594662417b5fb2c7378f326c6b Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 08 一月 2025 18:12:31 +0800
Subject: [PATCH] 1.优化上传相关代码。 2.修复多个文件上传时进度条显示异常。

---
 app/src/main/java/com/dayu/pipirrapp/net/ApiService.java |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/dayu/pipirrapp/net/ApiService.java b/app/src/main/java/com/dayu/pipirrapp/net/ApiService.java
index 73eb9ff..1bafe3b 100644
--- a/app/src/main/java/com/dayu/pipirrapp/net/ApiService.java
+++ b/app/src/main/java/com/dayu/pipirrapp/net/ApiService.java
@@ -13,11 +13,11 @@
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
+import retrofit2.http.Header;
 import retrofit2.http.Multipart;
 import retrofit2.http.POST;
 import retrofit2.http.Part;
 import retrofit2.http.PartMap;
-import retrofit2.http.Path;
 import retrofit2.http.QueryMap;
 import retrofit2.http.Streaming;
 import retrofit2.http.Url;
@@ -40,11 +40,14 @@
     @POST()
     Observable<BaseResponse> requestPost(@Url String url, @Body Map<String, Object> params);
 
-    @GET("{url}")
-    Observable<BaseResponse> requestGet(@Path("url") String url, @QueryMap Map<String, Object> params);
+    @GET()
+    Observable<BaseResponse> requestGet(@Url String url, @QueryMap Map<String, Object> params, @Header("token") String token);
 
-    @GET("{url}")
-    Observable<BaseResponse> requestGet(@Path("url") String url);
+    @GET()
+    Observable<BaseResponse> requestGet(@Url String url);
+
+    @GET()
+    Observable<BaseResponse> requestGet(@Url String url, @Header("token") String token);
 
     @Streaming
     @GET()
@@ -55,11 +58,15 @@
     Call<BaseResponse> uploadFiles(@PartMap Map<String, RequestBody> map);
 
     @Multipart
-    @POST(Constants.BASE_URL + "file/upload")
-    Call<BaseResponse> uploadFile(@Part("description") RequestBody description, @Part MultipartBody.Part file);
+    @POST(Constants.BASE_UPLOAD_FILE_URL + "/app/webFile/upPhoto")
+    Call<BaseResponse> uploadImgFile(@Part MultipartBody.Part file, @Part("description") RequestBody description);
+
+    @Multipart
+    @POST(Constants.BASE_UPLOAD_FILE_URL + "/app/webFile/upVideo")
+    Call<BaseResponse> uploadVideoFile(@Part MultipartBody.Part file, @Part("description") RequestBody description);
 
     //鑾峰彇楠岃瘉鐮�
-    @GET(Constants.BASE_URL+":8088/app/captcha/get")
+    @GET(Constants.BASE_URL + "/app/captcha/get")
     Observable<CodeResult> getCode(@QueryMap Map<String, Object> params);
 
     @GET()

--
Gitblit v1.8.0