From 0b37364a1160a69a9cc5ecdf7d6e9f5b4bc41d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Thu, 8 Jan 2026 15:36:17 +0800 Subject: [PATCH] =?UTF-8?q?1:=E6=B7=BB=E5=8A=A0=E9=85=92=E5=90=A7=E6=88=BF?= =?UTF-8?q?=E6=8A=B1=E9=BA=A6=E6=8E=A8=E9=80=81=EF=BC=8C=E5=9C=A8=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E8=BF=87=E6=9D=A5=E5=90=8E=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=A4=BC=E7=89=A9=202:=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=85=92=E5=90=A7=E6=88=BF=E8=AE=BE=E7=BD=AE=E4=BA=86=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=A4=BC=E7=89=A9=E6=8E=A8=E9=80=81=203:?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89=E7=A4=BC=E7=89=A9?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E4=BA=86roomId=EF=BC=8C=E7=94=A8=E4=BA=8E=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xscm/moduleutil/bean/RoomMessageEvent.java | 4 ++-- .../com/xscm/moduleutil/bean/room/EMMessageInfo.java | 5 +++++ .../main/java/com/xscm/moduleutil/http/ApiServer.java | 2 +- .../java/com/xscm/moduleutil/http/RetrofitClient.java | 4 ++-- .../modulemain/activity/room/activity/RoomActivity.kt | 11 +++++++++++ .../activity/room/fragment/ChatRoomFragment.java | 2 ++ .../activity/room/fragment/RoomFragment.java | 3 +++ .../activity/room/fragment/RoomPubFragment.kt | 11 +++++++++++ .../dialog/barRoom/SetupCustomGiftDialog.kt | 4 ++-- .../com/xscm/modulemain/widget/RoomPubWheatView.kt | 4 ++++ 10 files changed, 43 insertions(+), 7 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java index ae59f407..d57a850b 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java @@ -30,7 +30,7 @@ public class RoomMessageEvent extends BaseEvent { public static class T { private String text; private String GiftNum; - private String pit_number;//麦位 + private String pit_number;//麦位 酒吧房的情况下，这个是抱麦的number private String jia_jia;//坐骑 private UserInfo FromUserInfo;//从me private UserInfo ToUserInfo;// 到you @@ -47,7 +47,7 @@ public class RoomMessageEvent extends BaseEvent { private List auction_list; //拍卖列表 private long duration;//时间 private RoomAuction.AuctionListBean recipient;//是否成功，有值的是成功的，没有值的时候，是失败的 - private int type;//拍卖者，1：上麦、2：下麦 暴币的时候，1是大奖 2：是小奖 + private int type;//拍卖者，1：上麦、2：下麦 暴币的时候，1是大奖 2：是小奖 在酒吧房的时候， 0：没有选择自定义礼物 1：选择了自定义礼物 private String hot_value; private String SendRoomId;//发起者所在的房间ID private String AcceptRoomId;//接收者所在的房间id diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java index d171664f..ae7f8395 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java @@ -165,6 +165,11 @@ public class EMMessageInfo implements MultiItemEntity { public static final int QXRoomMessageTypeFlirtatious = 1200; /// 进入酒吧房的小黑屋 public static final int QXRoomMessageTypeFlirtatiousRoom = 1201; + /// 酒吧房抱麦推送 + public static final int QXRoomMessageTypeFlirtatiousRoomPush = 1202; + /// 酒吧房设置了自定义礼物推送 + public static final int QXRoomMessageTypeFlirtatiousRoomCustom = 1203; + private RoomMessageEvent emMessage; diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java index c56ea4be..6ca44bde 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java @@ -364,7 +364,7 @@ public interface ApiServer { Call>> getNewGiftList(@Query("label") int label, @Query("type") String type ); @GET(Constants.SET_CUSTOM_GIFT) - Call> setCustomGift(@Query("gift_id") String gift_id, @Query("gift_remark_name") String new_gift_name ); + Call> setCustomGift(@Query("gift_id") String gift_id, @Query("gift_remark_name") String new_gift_name ,@Query("room_id") String room_id ); @GET(Constants.TOPIC_LIST) //获取话题 diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index 3f0c6b00..b55b10d7 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -2365,8 +2365,8 @@ public class RetrofitClient { }); } - public void setCustomGift(String gift_id, String new_gift_name, BaseObserver observer) { - sApiServer.setCustomGift(gift_id, new_gift_name).enqueue(new Callback>() { + public void setCustomGift(String gift_id, String new_gift_name,String roomId, BaseObserver observer) { + sApiServer.setCustomGift(gift_id, new_gift_name,roomId).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index c9194964..74ce778f 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -1592,6 +1592,17 @@ class RoomActivity : BaseMvpActivity(), publicScreenFragment?.setupExMessageListener() } } + }else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatiousRoomPush) {//酒吧房抱麦推送 + if (mRoomInfoResp?.user_info?.user_id.toString() == messageEvent.text.user_id) { + WishGiftDialog( + ActivityUtils.getTopActivity(), + roomId.toString(), + messageEvent.text.pit_number + ).show() + } + + }else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatiousRoomCustom) {//酒吧房设置了自定义礼物后推送 + roomFragment?.handleRoomMessage(messageEvent) } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java index 8e2c122d..45e0b364 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java @@ -581,6 +581,8 @@ public class ChatRoomFragment extends BaseMvpFragment + if (view.pitBean.user_id != mUserInfo?.user_id.toString() && view.pitBean.user_id == messageEvent.text.user_id) { // 判断不是自己 + view.setIvCustomGift(messageEvent.text.type == 1) + } + // 如果是自己，则不进行任何操作 + } + + } } \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/barRoom/SetupCustomGiftDialog.kt b/MainModule/src/main/java/com/xscm/modulemain/dialog/barRoom/SetupCustomGiftDialog.kt index 808afcc4..add69946 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/barRoom/SetupCustomGiftDialog.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/barRoom/SetupCustomGiftDialog.kt @@ -28,7 +28,7 @@ class SetupCustomGiftDialog(context: Context, val roomId: String) : var adapter: SetupCustomGiftAdapter? = null var time: MutableList = mutableListOf() - + var mRoomId : String =roomId var performInputDialog: PerformInputDialog? = null override fun getLayoutId(): Int { @@ -61,7 +61,7 @@ class SetupCustomGiftDialog(context: Context, val roomId: String) : performInputDialog?.setOnConfirmListener { content -> // TODO: 这里表演内容的回调 t[position].gift_remark_name=content - RetrofitClient.getInstance().setCustomGift(t[position].gift_id,content,object : BaseObserver() { + RetrofitClient.getInstance().setCustomGift(t[position].gift_id,content,mRoomId,object : BaseObserver() { override fun onSubscribe(d: Disposable) { } diff --git a/MainModule/src/main/java/com/xscm/modulemain/widget/RoomPubWheatView.kt b/MainModule/src/main/java/com/xscm/modulemain/widget/RoomPubWheatView.kt index 94bec01e..65f26e17 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/widget/RoomPubWheatView.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/widget/RoomPubWheatView.kt @@ -121,6 +121,10 @@ class RoomPubWheatView : BaseWheatView { iv_gift?.setSource(giftPlayString, 2) } + fun setIvCustomGift(boolean: Boolean){ + iv_custom_gift?.visibility = if (boolean) View.VISIBLE else View.GONE + } + private fun handleOnState(bean: RoomPitBean) { mIvRipple.visibility = VISIBLE mTvName.text = bean.nickname