From ec6193939600ca7930193b1d5942b1700baf9e06 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期五, 21 二月 2025 09:20:15 +0800 Subject: [PATCH] 1.巡检记录列表页的实现 2.巡检记录地图展示路径的详情页。 3.处理巡检记录详情页因打开同一个网址导致的webView不显示问题。 4.实现地图页搜索后的地图跳转功能。 5.巡检记录详情页数据加载的优化,默认加载本地数据,当本地没有数据时从服务端获取数据。 --- app/src/main/java/com/dayu/pipirrapp/net/ApiService.java | 37 +++++++++++++++++++++++++++++-------- 1 files changed, 29 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 3f7e4df..1be5448 100644 --- a/app/src/main/java/com/dayu/pipirrapp/net/ApiService.java +++ b/app/src/main/java/com/dayu/pipirrapp/net/ApiService.java @@ -1,8 +1,10 @@ package com.dayu.pipirrapp.net; +import com.dayu.pipirrapp.bean.net.CodeResult; +import com.dayu.pipirrapp.bean.net.WeatherResponse; +import com.dayu.pipirrapp.bean.net.UploadFileResult; -import java.util.List; import java.util.Map; import io.reactivex.rxjava3.core.Observable; @@ -12,11 +14,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; @@ -30,15 +32,23 @@ public interface ApiService { + //鑾峰彇澶╂皵 + @GET() + Call<WeatherResponse> requestWeather(@Url String url, @QueryMap Map<String, Object> params); + + // @FormUrlEncoded @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() @@ -49,7 +59,18 @@ 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<UploadFileResult>> uploadImgFile(@Part MultipartBody.Part file, @Part("description") RequestBody description); + + @Multipart + @POST(Constants.BASE_UPLOAD_FILE_URL + "/app/webFile/upVideo") + Call<BaseResponse<UploadFileResult>> uploadVideoFile(@Part MultipartBody.Part file, @Part("description") RequestBody description); + + //鑾峰彇楠岃瘉鐮� + @GET(Constants.BASE_URL + "/app/captcha/get") + Observable<CodeResult> getCode(@QueryMap Map<String, Object> params); + + @GET() + Observable<ResponseBody> downloadTile(@Url String url); } -- Gitblit v1.8.0