From 45e69852f43abe0f79967786ada3c7cf887b5b48 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 24 九月 2024 10:53:14 +0800
Subject: [PATCH] 从服务端获取取水口坐标并显示在地图上

---
 app/src/main/java/com/dayu/pipirrapp/net/ApiService.java |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 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 5c29ff7..3e73681 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,8 @@
 package com.dayu.pipirrapp.net;
 
 
-
-import com.dayu.pipirrapp.bean.WeatherResponse;
+import com.dayu.pipirrapp.bean.net.CodeResult;
+import com.dayu.pipirrapp.bean.net.WeatherResponse;
 
 import java.util.Map;
 
@@ -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()
@@ -58,4 +61,11 @@
     @POST(Constants.BASE_URL + "file/upload")
     Call<BaseResponse> uploadFile(@Part("description") RequestBody description, @Part MultipartBody.Part file);
 
+    //鑾峰彇楠岃瘉鐮�
+    @GET(Constants.BASE_URL+":8088/app/captcha/get")
+    Observable<CodeResult> getCode(@QueryMap Map<String, Object> params);
+
+    @GET()
+    Observable<ResponseBody> downloadTile(@Url String url);
+
 }

--
Gitblit v1.8.0