处理冲突

This commit is contained in:
hch 2023-10-17 11:19:46 +08:00
parent 52d565c4ee
commit da6782c7b0

View File

@ -116,10 +116,12 @@ public interface OneToOneApi {
Observable<ResponseModel<List<TargetUserInfoBean>>> getTargetUserInfoList(@Query("ids") String ids);
@GET("/api/public/?service=Friendappuser.hot")
Observable<ResponseModel<List<HomeItemBean>>> getHomeHot();
Observable<ResponseModel<List<HomeItemBean>>> getHomeHot(@Query("p") String p);
@GET("/api/public/?service=Friendappuser.recommend")
Observable<ResponseModel<List<HomeItemBean>>> getHomeRecommend();
Observable<ResponseModel<List<HomeItemBean>>> getHomeRecommend(@Query("p") String p);
@GET("/api/public/?service=Message.getListInfo")
Observable<ResponseModel<List<SystemMessageBean>>> getSystemMessageList(@Query("type") int type);
@ -140,23 +142,66 @@ public interface OneToOneApi {
@GET("/api/public/?service=Friendappmsg.giftList")
Observable<ResponseModel<List<GiftBean>>> getGiftList();
@GET("/api/public/?service=Friendappmoney.info")
Observable<ResponseModel<PurseBean>> getPurseInfo();
@GET("/api/public/?service=User.setAttents")
Observable<ResponseModel<List<FollowBean>>> follow(@Query("touid")String toUid);
Observable<ResponseModel<List<FollowBean>>> follow(@Query("touid") String toUid);
/**
*
* @param type 1魅力榜 2财富榜
* @param date 1日榜 2周榜
*/
@GET("/api/public/?service=Friendapprank.list")
Observable<ResponseModel<List<HomeRankBean>>> getHomeRank(
@Query("type")String type,
@Query("date")String date
@Query("type") String type,
@Query("date") String date
);
@GET("/api/public/?service=Friendappuser.list")
Observable<ResponseModel<List<HomeItemBean>>> search(
@Query("keyword") String keyword,
@Query("age") String age,
@Query("name_auth") String name_auth,
@Query("sex") String sex,
@Query("star") String star,
@Query("p") String p
);
@GET("/api/public/?service=Friendappuser.like")
Observable<ResponseModel<List<HomeItemBean>>> getSearchRecommend();
/**
* 设置基本信息
*/
@FormUrlEncoded
@POST("/api/public/?service=Friendappinfos.setInfo")
Observable<ResponseModel<List<BaseModel>>> setInfo(
@Field("avatar") String avatar,
@Field("user_nicename") String userNicename,
@Field("sex") int sex,
@Field("birthday") String birthday
);
/**
* 获取系统默认头像列表
*/
@GET("/api/public/?service=Userhome.getDefaultAvatarList")
Observable<ResponseModel<List<UserAvatarSelectBean>>> getSystemUserAvatar(@Query("user_id") String uid);
/**
* 获取系统标签
*/
@GET("/api/public/?service=Friendapplable.get")
Observable<ResponseModel<List<HomeRankBean>>> getSysLabel(
);
}