feat:完善首页数据对接（首页排行榜、我的房间、房间标签列表）
feat：删除部分无用代码
This commit is contained in:
max
11
core/src/main/java/com/chwl/core/home/bean/HomeRankBean.kt
Normal file
11
core/src/main/java/com/chwl/core/home/bean/HomeRankBean.kt
Normal file
@@ -0,0 +1,11 @@
|
||||
package com.chwl.core.home.bean
|
||||
|
||||
import androidx.annotation.Keep
|
||||
|
||||
@Keep
|
||||
data class HomeRankBean(
|
||||
val avatar: String?,
|
||||
val erbanNo: Long?,
|
||||
val nick: String?,
|
||||
val uid: Long?
|
||||
)
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.chwl.core.home.bean
|
||||
|
||||
import androidx.annotation.Keep
|
||||
|
||||
@Keep
|
||||
data class HomeRoomCardInfo(
|
||||
val avatar: String?,
|
||||
val introduction: String?,
|
||||
val micUserCount: Long?,
|
||||
val micUsers: List<MicUsersBean>?,
|
||||
val onlineNum: Long?,
|
||||
val partitionId: Long?,
|
||||
val roomId: Long?,
|
||||
val title: String?,
|
||||
val uid: Long?,
|
||||
)
|
||||
@@ -99,64 +99,24 @@ object HomeModel : BaseModel() {
|
||||
)
|
||||
}
|
||||
|
||||
suspend fun getHotRoom(): List<HomeRoomInfo>? =
|
||||
launchRequest {
|
||||
api.getHotRoom()
|
||||
}
|
||||
|
||||
suspend fun getCommonRoom(tabId: Int, pageNum: Int, pageSize: Int): List<HomeRoomInfo>? =
|
||||
launchRequest {
|
||||
api.getCommonRoom(tabId, pageNum, pageSize)
|
||||
}
|
||||
|
||||
suspend fun getGameRoom(pageNum: Int, pageSize: Int): List<HomeRoomInfo>? =
|
||||
launchRequest {
|
||||
api.getGameRoom(pageNum, pageSize)
|
||||
}
|
||||
|
||||
suspend fun getConcernsRoom(): List<HomeRoomInfo>? =
|
||||
launchRequest {
|
||||
api.getConcernsRoom()
|
||||
}
|
||||
|
||||
suspend fun getCollectRoom(pageNum: Int, pageSize: Int): CollectionRoomInfo? =
|
||||
launchRequest {
|
||||
api.getCollectRoom(AuthModel.get().currentUid, pageNum, pageSize)
|
||||
}
|
||||
|
||||
suspend fun fastPickGameRoom(mgId: Long?): HomeRoomInfo? =
|
||||
launchRequest {
|
||||
api.fastPickGameRoom(mgId)
|
||||
}
|
||||
|
||||
suspend fun getMoreSingleAnchorList(id: Long?): List<HomeRoomInfo>? =
|
||||
launchRequest {
|
||||
api.getMoreSingleAnchorList(if (id == 0L) null else id)
|
||||
}
|
||||
|
||||
suspend fun requestAnchorInfo(): AnchorInfo? =
|
||||
launchRequest {
|
||||
api.requestAnchorInfo()
|
||||
}
|
||||
|
||||
suspend fun getHomePlayV2(): List<HomeRoomInfo>? =
|
||||
launchRequest {
|
||||
api.apiHomePlayV2()
|
||||
}
|
||||
|
||||
suspend fun getNewFriendList(gender: Int?): List<UserInfo>? =
|
||||
launchRequest {
|
||||
api.getNewFriendList(gender)
|
||||
}
|
||||
|
||||
suspend fun getStarUserList(pageNum: Int, pageSize: Int): List<StarUser>? =
|
||||
launchRequest {
|
||||
api.getStarUserList(pageNum, pageSize)
|
||||
}
|
||||
|
||||
suspend fun getNewHomeTag(): List<HomeTagInfo>? =
|
||||
suspend fun getNewHomeTab(): List<HomeTagInfo>? =
|
||||
launchRequest {
|
||||
api.getNewHomeTag()
|
||||
api.getNewHomeTab()
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -209,6 +169,32 @@ object HomeModel : BaseModel() {
|
||||
api.getEffectResourceList()
|
||||
}
|
||||
|
||||
suspend fun getHomeRankList(): MutableList<MutableList<HomeRankBean>>? =
|
||||
launchRequest {
|
||||
api.getHomeRankList()
|
||||
}
|
||||
|
||||
suspend fun getMyRoomInfo(): HomeRoomCardInfo? =
|
||||
launchRequest {
|
||||
api.getMyRoomInfo()
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取首页-最近访问房间
|
||||
*/
|
||||
suspend fun getHomeHistoryRoomList(pageNum: Int, pageSize: Int): List<HomeRoomInfo>? =
|
||||
launchRequest {
|
||||
api.getHomeHistoryRoomList(pageNum, pageSize)
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取首页-我的收藏
|
||||
*/
|
||||
suspend fun getHomeMyCollectRoomList(pageNum: Int, pageSize: Int): List<HomeRoomInfo>? =
|
||||
launchRequest {
|
||||
api.getHomeMyCollectRoomList(pageNum, pageSize)
|
||||
}
|
||||
|
||||
private interface Api {
|
||||
|
||||
/**
|
||||
@@ -313,14 +299,6 @@ object HomeModel : BaseModel() {
|
||||
@Query("ticket") ticket: String
|
||||
): ServiceResult<List<BannerInfo>>
|
||||
|
||||
/**
|
||||
* 首页热门房间
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GET("/home/hotRoom")
|
||||
suspend fun getHotRoom(): ServiceResult<List<HomeRoomInfo>>
|
||||
|
||||
/**
|
||||
* 首页热门房间
|
||||
*
|
||||
@@ -333,45 +311,6 @@ object HomeModel : BaseModel() {
|
||||
@Query("pageSize") pageSize: Int
|
||||
): ServiceResult<List<HomeRoomInfo>>
|
||||
|
||||
/**
|
||||
* 首页游戏房间
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GET("home/miniGameTabList")
|
||||
suspend fun getGameRoom(
|
||||
@Query("pageNum") pageNum: Int,
|
||||
@Query("pageSize") pageSize: Int
|
||||
): ServiceResult<List<HomeRoomInfo>>
|
||||
|
||||
/**
|
||||
* 首页派对 Tag List
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GET("/fans/partTabFollowList")
|
||||
suspend fun getConcernsRoom(): ServiceResult<List<HomeRoomInfo>>
|
||||
|
||||
/**
|
||||
* 首页派对 Tag List
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GET("/fans/fansRoomList")
|
||||
suspend fun getCollectRoom(
|
||||
@Query("uid") uid: Long,
|
||||
@Query("page") pageNum: Int,
|
||||
@Query("pageSize") pageSize: Int
|
||||
): ServiceResult<CollectionRoomInfo>
|
||||
|
||||
/**
|
||||
* 首页派对 Tag List
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GET("home/fastPickV2")
|
||||
suspend fun fastPickGameRoom(@Query("mgId") mgId: Long?): ServiceResult<HomeRoomInfo>
|
||||
|
||||
/**
|
||||
* 首页人气主播更多二级页面
|
||||
*
|
||||
@@ -380,28 +319,6 @@ object HomeModel : BaseModel() {
|
||||
@GET("/single/broadcast/morePopularityAnchorList")
|
||||
suspend fun getMoreSingleAnchorList(@Query("singleRoomSortId") id: Long?): ServiceResult<List<HomeRoomInfo>>
|
||||
|
||||
/**
|
||||
* @return
|
||||
*/
|
||||
@GET("user/get/userCard")
|
||||
suspend fun requestAnchorInfo(): ServiceResult<AnchorInfo>
|
||||
|
||||
/**
|
||||
* 首页聊天交友
|
||||
*
|
||||
* @return -
|
||||
*/
|
||||
@GET("/home/playV2")
|
||||
suspend fun apiHomePlayV2(): ServiceResult<List<HomeRoomInfo>>
|
||||
|
||||
/**
|
||||
* 发现新朋友
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GET("/home/newFriend")
|
||||
suspend fun getNewFriendList(@Query("gender") gender: Int?): ServiceResult<List<UserInfo>>
|
||||
|
||||
/**
|
||||
* 星球推荐用户列表
|
||||
*
|
||||
@@ -418,8 +335,8 @@ object HomeModel : BaseModel() {
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GET("/home/tagV2")
|
||||
suspend fun getNewHomeTag(): ServiceResult<List<HomeTagInfo>>
|
||||
@GET("/home/tabV3/list")
|
||||
suspend fun getNewHomeTab(): ServiceResult<List<HomeTagInfo>>
|
||||
|
||||
/**
|
||||
* 首页推荐房间
|
||||
@@ -430,7 +347,7 @@ object HomeModel : BaseModel() {
|
||||
* @param ticket
|
||||
* @return
|
||||
*/
|
||||
@GET("/home/tab/homeV2")
|
||||
@GET("/home/tabV3/pageRoom")
|
||||
suspend fun apiHomeTabHome(
|
||||
@Query("tabId") tabId: Int,
|
||||
@Query("pageNum") page: Int,
|
||||
@@ -460,6 +377,37 @@ object HomeModel : BaseModel() {
|
||||
*/
|
||||
@GET("resource/effect")
|
||||
suspend fun getEffectResourceList(): ServiceResult<MutableList<String>>
|
||||
|
||||
/**
|
||||
* 首页-聚合排行榜
|
||||
*/
|
||||
@GET("home/getRankSlideshow")
|
||||
suspend fun getHomeRankList(): ServiceResult<MutableList<MutableList<HomeRankBean>>>
|
||||
|
||||
/**
|
||||
* 首页-我的房间
|
||||
*/
|
||||
@GET("home/getMyRoom")
|
||||
suspend fun getMyRoomInfo(): ServiceResult<HomeRoomCardInfo>
|
||||
|
||||
/**
|
||||
* 首页-最近访问房间
|
||||
*/
|
||||
@GET("/home/recent/pageRoom")
|
||||
suspend fun getHomeHistoryRoomList(
|
||||
@Query("pageNum") page: Int,
|
||||
@Query("pageSize") pageSize: Int
|
||||
): ServiceResult<List<HomeRoomInfo>>
|
||||
|
||||
/**
|
||||
* 首页-我的收藏房间
|
||||
*/
|
||||
@GET("/home/collect/pageRoom")
|
||||
suspend fun getHomeMyCollectRoomList(
|
||||
@Query("pageNum") page: Int,
|
||||
@Query("pageSize") pageSize: Int
|
||||
): ServiceResult<List<HomeRoomInfo>>
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,7 +4,6 @@ import com.google.gson.JsonElement;
|
||||
import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData;
|
||||
import com.chwl.core.base.IModel;
|
||||
import com.chwl.core.bean.response.ServiceResult;
|
||||
import com.chwl.core.gift.bean.GiftFreeInfo;
|
||||
import com.chwl.core.gift.bean.GiftInfo;
|
||||
import com.chwl.core.home.bean.HomeRoomInfo;
|
||||
import com.chwl.core.room.activitytimer.TimerBean;
|
||||
|
||||
Reference in New Issue
Block a user