From 92f09807eeb57f0cb9a4686cde38834549b34962 Mon Sep 17 00:00:00 2001
From: nilupeng <qingingrunt2010@qq.com>
Date: Tue, 09 Aug 2022 11:00:15 +0000
Subject: [PATCH] Merge branch 'master' into page
---
app/src/main/java/com/runt/open/mvvm/retrofit/api/CommonApiCenter.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/runt/open/mvvm/retrofit/api/CommonApiCenter.java b/app/src/main/java/com/runt/open/mvvm/retrofit/api/CommonApiCenter.java
index fef1d1e..0922a46 100644
--- a/app/src/main/java/com/runt/open/mvvm/retrofit/api/CommonApiCenter.java
+++ b/app/src/main/java/com/runt/open/mvvm/retrofit/api/CommonApiCenter.java
@@ -1,17 +1,24 @@
package com.runt.open.mvvm.retrofit.api;
-
import com.runt.open.mvvm.data.ApkUpGradeResult;
+import com.runt.open.mvvm.data.HttpApiResult;
+import com.runt.open.mvvm.data.PageResult;
+import com.runt.open.mvvm.data.Results;
import java.util.Map;
import io.reactivex.Observable;
+import okhttp3.MultipartBody;
+import okhttp3.ResponseBody;
+import retrofit2.Call;
import retrofit2.http.Field;
import retrofit2.http.FieldMap;
import retrofit2.http.FormUrlEncoded;
import retrofit2.http.GET;
+import retrofit2.http.Multipart;
import retrofit2.http.POST;
+import retrofit2.http.Part;
import retrofit2.http.Query;
import retrofit2.http.QueryMap;
import retrofit2.http.Url;
@@ -41,7 +48,7 @@
* @return
*/
@GET
- Observable<Object> getPageData(@Url String url, @Query("pageNum") int pageNum, @Query("pageSize") int pageSize, @QueryMap Map<String,String> param);
+ Observable<HttpApiResult<PageResult>> getPageData(@Url String url, @Query("page") int pageNum, @Query("size") int pageSize, @QueryMap Map<String,String> param);
/**
* 分页数据
@@ -53,7 +60,7 @@
*/
@FormUrlEncoded
@POST
- Observable<Object> postPageData(@Url String url, @Field("pageNum") int pageNum, @Field("pageSize") int pageSize, @FieldMap Map<String,String> param);
+ Observable<Object> postPageData(@Url String url, @Field("page") int pageNum, @Field("size") int pageSize, @FieldMap Map<String,String> param);
/**
* app更新
@@ -62,5 +69,20 @@
@GET("system/appupgrade/tourist/get/2")
Observable<ApkUpGradeResult> getAppUpdate();
+ @POST("updateName")
+ Observable<ApkUpGradeResult> updateName(@Field("username") String name);
+ @Multipart
+ @POST("updatehead")
+ Call<ResponseBody> updateHead(@Part MultipartBody.Part file);
+
+
+ /**
+ * 获取咨询列表
+ * @param pageNum 页数
+ * @param pageSize 每页数量
+ * @return
+ */
+ @GET("getMsgList")
+ Observable<HttpApiResult<PageResult<Results.Message>>> getMsgList(@Query("page") int pageNum, @Query("size") int pageSize);
}
--
Gitblit v1.9.1