moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

跨房PK:搜索房间接增加roomUid参数

Browse Source
This commit is contained in:
huangjian
2021-11-15 11:40:47 +08:00
parent 792fd66cbf
commit 213f80333f
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchActivity.kt
View File

@@ -17,6 +17,7 @@ import com.yizhuan.erban.databinding.ActivityRoomPkSearchBinding
import com.yizhuan.erban.ui.user.UserInfoActivity
import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.erban.ui.widget.TextWatcherSimple
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel
import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo
import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo
@@ -98,7 +99,7 @@ class RoomPKSearchActivity : BaseViewBindingActivity<ActivityRoomPkSearchBinding
@SuppressLint("CheckResult")
private fun loadData(isRefresh: Boolean) {
pageNum = if (isRefresh) 1 else pageNum + 1
RoomPKModel.searchPermitRoom(searchKey, pageNum, pageSize)
RoomPKModel.searchPermitRoom(searchKey, AvRoomDataManager.get().roomUid, pageNum, pageSize)
.compose(bindToLifecycle())
.subscribe({
rvDelegate.loadData(it, isRefresh)

4
app/src/main/res/values/strings.xml
View File

@@ -84,9 +84,9 @@
<string name="gift_income_gold">钻石</string>
<string name="gift_expend_gold">钻石</string>
<string name="bill_title">账单</string>
<string name="bill_gift_gold_num">账户余额: %.2f钻石</string>
<string name="bill_gift_gold_num">账户余额: %.0f钻石</string>
<string name="gold_num_text">%.2f钻石</string>
<string name="gold_num_text">%.0f钻石</string>
<string name="red_packet_withdraw">红包提现</string>

7
core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/RoomPKModel.kt
View File

@@ -60,7 +60,8 @@ object RoomPKModel {
/**
* 跨房pk/牌照房搜索
*
* @param erbanNo erbanNo,空则获取全部牌照房
* @param erbanNo erbanNo,空则获取全部牌照房
* @param roomUid roomUid
* @param pageNum pageNum
* @param pageSize pageSize
*
@@ -68,10 +69,11 @@ object RoomPKModel {
*/
fun searchPermitRoom(
erbanNo: String?,
roomUid: Long?,
pageNum: Int,
pageSize: Int
): Single<List<SimpleRoomInfo>> {
return api.searchPermitRoom(erbanNo, pageNum, pageSize)
return api.searchPermitRoom(erbanNo,roomUid, pageNum, pageSize)
.compose(RxHelper.handleSchAndExce())
.compose(RxHelper.handleBeanData())
}
@@ -129,6 +131,7 @@ object RoomPKModel {
@GET("/search/permitRoom")
fun searchPermitRoom(
@Query("erbanNo") erbanNo: String?,
@Query("roomUid") roomUid: Long?,
@Query("pageNum") pageNum: Int,
@Query("pageSize") pageSize: Int
): Single<ServiceResult<List<SimpleRoomInfo>>>