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 09:01:59 +08:00
parent 2f0f5ae5e8
commit b76136b604
15 changed files with 111 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1151,6 +1151,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
"1",
giftGiveEvent!!.getPit(),
giftGiveEvent!!.heart_id,
giftGiveEvent!!.giftModel.gift_bag.toString(),
object : BaseObserver<RoomGiftData?>() {
override fun onSubscribe(d: Disposable) {
}
@@ -1574,6 +1575,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
QXGiftPlayerManager.getInstance(this)
.displayChatEffectView(messageEvent.text.play_image)
}else if( msgType == EMMessageInfo.QXRoomMessageTypeFlirtatious){ //酒吧房撩ta推送的信息
roomFragment?.handleRoomMessage(messageEvent)
}
}

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
View File

@@ -611,6 +611,7 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
break;
case 1005:
case 1100:
case 1200:
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).roomInfoEvent(message);
}
@@ -652,6 +653,7 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
case 1005:
case 1100:
case 1200:
if (text.getText() != null) {
return new EMMessageInfo(message);
}

3
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java
View File

@@ -841,6 +841,9 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
case 1058:
roomPubFragment.event1058(messageEvent);
break;
case 1200:
roomPubFragment.event1200(messageEvent);
break;
}
}
private void handleMentorshipEvent(RoomMessageEvent messageEvent) {

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

@@ -14,6 +14,7 @@ import com.xscm.modulemain.dialog.barRoom.GiftGivingDialog
import com.xscm.modulemain.dialog.barRoom.RoomAboutDialog
import com.xscm.modulemain.dialog.barRoom.RoomDurationDialog
import com.xscm.modulemain.dialog.barRoom.SetupCustomGiftDialog
import com.xscm.modulemain.dialog.barRoom.WishGiftDialog
import com.xscm.modulemain.widget.RoomPubWheatView
import com.xscm.moduleutil.base.BaseMvpFragment
import com.xscm.moduleutil.base.CommonAppContext
@@ -25,10 +26,10 @@ import com.xscm.moduleutil.utils.ClickUtils
import com.xscm.moduleutil.utils.SpUtil
/**
* @Author
* @Time 2026/1/6 14:47
* @Description 酒吧房fragment
*/
* @Author
* @Time 2026/1/6 14:47
* @Description 酒吧房fragment
*/
class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
BaseMvpFragment<PubPresenter, FragmentPubRoomBinding>() {
@@ -80,18 +81,36 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
view.setData(bean)
view.iv_custom_gift?.setOnClickListener {
GiftGivingDialog(ActivityUtils.getTopActivity(), mRoomId,view.pitBean.user_id,view.pitBean.nickname,view.pitBean.avatar).show()
GiftGivingDialog(
ActivityUtils.getTopActivity(),
mRoomId,
view.pitBean.user_id,
view.pitBean.nickname,
view.pitBean.avatar
).show()
}
view.ivYueT?.setOnClickListener {
RoomAboutDialog(ActivityUtils.getTopActivity(),mRoomId,view.pitBean.user_id,view.pitBean.nickname,view.pitBean.avatar).show()
RoomAboutDialog(
ActivityUtils.getTopActivity(),
mRoomId,
view.pitBean.user_id,
view.pitBean.nickname,
view.pitBean.avatar
).show()
}
view.ivLiaoT?.setOnClickListener {
if (!SpUtil.getBooleanValue("pub", false)) {
FlirtatiousDialog(ActivityUtils.getTopActivity()).show()
}else{
if (SpUtil.getBooleanValue("pub", false)) {
FlirtatiousDialog(
ActivityUtils.getTopActivity(),
view.pitBean.nickname
).show()
} else {
FlirtatiousDialog(
ActivityUtils.getTopActivity(),
view.pitBean.nickname
).show()
}
}
@@ -100,7 +119,7 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
return@setOnClickListener
}
if (mUserInfo?.pit_number == 9 && (view.pitBean.user_id == "0" || view.pitBean.user_id.isEmpty())){
if (mUserInfo?.pit_number == 9 && (view.pitBean.user_id == "0" || view.pitBean.user_id.isEmpty())) {
val mPitBean =
mRoomInfoResp?.room_info?.pit_list!![indexList[idx].toInt() - 1]
@@ -112,7 +131,7 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
mRoomInfoResp,
childFragmentManager
)
} else if (mUserInfo?.pit_number == 9 && !(view.pitBean.user_id == "0" || view.pitBean.user_id.isEmpty())){
} else if (mUserInfo?.pit_number == 9 && !(view.pitBean.user_id == "0" || view.pitBean.user_id.isEmpty())) {
RoomUserInfoFragment.show(
mRoomInfoResp?.room_info?.room_id,
view.getUserId(),
@@ -123,10 +142,12 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
isNumberWhether(),
childFragmentManager
)
}else{
} else {
if (view.pitBean.user_id == "0" || view.pitBean.user_id.isEmpty()) {
// TODO: 这是展示设置心愿礼物的，这里有个点，要考虑，当前用户在麦位上，点击的时候，直接走上麦按钮，如果不在麦上，就直接选择心愿礼物
// WishGiftDialog(ActivityUtils.getTopActivity(),mRoomId).show()
MvpPre!!.applyPit(mRoomInfoResp?.room_info?.room_id!!, view.pitNumber)
}else {
} else {
RoomUserInfoFragment.show(
mRoomInfoResp?.room_info?.room_id,
view.getUserId(),
@@ -144,7 +165,7 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
}
mBinding.ivSetTime.setOnClickListener {
RoomDurationDialog(ActivityUtils.getTopActivity(),mRoomId).show()
RoomDurationDialog(ActivityUtils.getTopActivity(), mRoomId).show()
}
mBinding.ivCustomGift.setOnClickListener {
SetupCustomGiftDialog(ActivityUtils.getTopActivity(), mRoomId).show()
@@ -285,4 +306,18 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
}
}
// TODO: 撩ta推送过来的，在touserInfos，包含了所有的麦上用户的id，这里根据用户麦上的用户id，进行判断，只有在麦上的，才会进行播放
fun event1200(messageEvent: RoomMessageEvent) {
for (view in viewList) {
if (view.userId.isNotEmpty()) {
for (userInfo in messageEvent.text.toUserInfos) {
if (view.userId == userInfo.user_id.toString()) {
// view.setData(view.pitBean)
view.setPitGift(messageEvent.text.giftInfo.play_image)
}
}
}
}
}
}

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/WheatPresenter.java
View File

@@ -132,7 +132,7 @@ public class WheatPresenter extends BasePresenter<WheatContacts.View> implements
@Override
public void roomGift(String room_id, String gift_id, String gift_num, String to_uid, String type, String pit_number) {
api.roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number,"", new BaseObserver<RoomGiftData>() {
api.roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number,"","", new BaseObserver<RoomGiftData>() {
@Override
public void onSubscribe(Disposable d) {