YUSHENG/yusheng-android
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1：修改酒吧房展示的，

Browse Source 
2：修改约她接口
This commit is contained in:
梁小江
2026-01-07 19:19:28 +08:00
parent 50d509dc12
commit 6338728ddf
8 changed files with 63 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
View File

@@ -96,6 +96,7 @@ import com.xscm.modulemain.dialog.RoomSettingFragment
import com.xscm.modulemain.dialog.SoundEffectsDialogFragment
import com.xscm.modulemain.dialog.TourClubDialogFragment
import com.xscm.modulemain.dialog.barRoom.MakeFriendsDialog
import com.xscm.modulemain.dialog.barRoom.WishGiftDialog
import com.xscm.modulemain.manager.RoomManager
import com.xscm.modulemain.service.ForegroundService
import com.xscm.modulemain.service.RoomPlayService
@@ -2700,21 +2701,29 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
if ((mRoomInfoResp?.user_info?.is_room_owner == 1 || mRoomInfoResp?.user_info?.is_host == 1 || mRoomInfoResp?.user_info?.is_management == 1)) 1 else 2
)
} else if (id == R.id.iv_wheat_feeding) { //点击上麦操作
if (mRoomInfoResp?.room_info?.room_up_pit_type == "1") {
// if (mRoomInfoResp?.room_info?.room_up_pit_type == "1") {
// if (maiStatus) {
// MvpPre!!.applyPit(roomId, "")
// } else {
// MvpPre!!.downPit(roomId, "")
// }
// } else {
if (maiStatus) {
MvpPre!!.applyPit(roomId, "")
} else {
MvpPre!!.downPit(roomId, "")
}
} else {
if (maiStatus) {
MvpPre!!.applyPit(roomId, "")
if (mRoomInfoResp?.room_info?.type_id == "11"){
WishGiftDialog(
ActivityUtils.getTopActivity(),
roomId.toString(),
""
).show()
}else {
MvpPre!!.applyPit(roomId, "")
}
maiStatus = false
} else {
MvpPre!!.downPit(roomId, "")
maiStatus = true
}
}
// }
}
}

20
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt
View File

@@ -125,7 +125,7 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
val bean = mRoomInfoResp?.room_info?.pit_list!![indexList[idx].toInt() - 1]
view.setData(bean)
if (idx != 0 && idx != 1) {
if (idx != 0 && idx != 1) {
if (!TextUtils.isEmpty(bean.user_id) && !bean.user_id.equals("0")) {
startTimer(bean.end_time.toLong())
}
@@ -197,8 +197,19 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
)
} else {
if (view.pitBean.user_id == "0" || view.pitBean.user_id.isEmpty()) {
// TODO: 这是展示设置心愿礼物的，这里有个点，要考虑，当前用户在麦位上，点击的时候，直接走上麦按钮，如果不在麦上，就直接选择心愿礼物
WishGiftDialog(ActivityUtils.getTopActivity(), mRoomId).show()
if (mRoomInfoResp?.user_info?.pit_number != 0) {
MvpPre!!.applyPit(
mRoomInfoResp?.room_info?.room_id!!,
view.pitNumber,""
)
} else {
// TODO: 这是展示设置心愿礼物的，这里有个点，要考虑，当前用户在麦位上，点击的时候，直接走上麦按钮，如果不在麦上，就直接选择心愿礼物
WishGiftDialog(
ActivityUtils.getTopActivity(),
mRoomId,
view.pitNumber
).show()
}
// MvpPre!!.applyPit(mRoomInfoResp?.room_info?.room_id!!, view.pitNumber)
} else {
RoomUserInfoFragment.show(
@@ -239,7 +250,8 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
mBinding.imAllLiao.setOnClickListener {
val validCount = mRoomInfoResp?.room_info?.pit_list?.take(6)
?.count { !it.user_id.isNullOrEmpty() && it.user_id != "0" } ?: 0
?.count { !it.user_id.isNullOrEmpty() && it.user_id != "0" && it.user_id != mRoomInfoResp?.user_info?.user_id.toString() }
?: 0
ConfirmDialog(
ActivityUtils.getTopActivity(),