YUSHENG/yusheng-android
7
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

6
BaseModule/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java
View File

@@ -160,6 +160,11 @@ public class EMMessageInfo implements MultiItemEntity {
public static final int QXRoomMessageTypeSignTipText = 1094;
/// 暴币展示动画列表
public static final int QXRoomMessageTypeSignChat = 1100;
/// 酒吧房撩ta推送
public static final int QXRoomMessageTypeFlirtatious = 1200;
private RoomMessageEvent emMessage;
private int custom = 0;
@@ -218,6 +223,7 @@ public class EMMessageInfo implements MultiItemEntity {
return 1;
case QXRoomMessageTypeRoomOMh:
case QXRoomMessageTypeGift:
case QXRoomMessageTypeFlirtatious:
return 3;
case 1:
case 2:

2
BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java
View File

@@ -578,7 +578,7 @@ public interface ApiServer {
@FormUrlEncoded
@POST(Constants.GET_ROOM_GIFT)
Call<BaseModel<RoomGiftData>> roomGift(@Field("room_id") String room_id, @Field("gift_id") String gift_id, @Field("gift_num") String num, @Field("to_uid") String to_uid, @Field("type") String gift_type, @Field("pit_number") String pit_number, @Field("heart_id") String heat_id);
Call<BaseModel<RoomGiftData>> roomGift(@Field("room_id") String room_id, @Field("gift_id") String gift_id, @Field("gift_num") String num, @Field("to_uid") String to_uid, @Field("type") String gift_type, @Field("pit_number") String pit_number, @Field("heart_id") String heat_id,@Field("gift_bag_id")String gift_bag_id);
@FormUrlEncoded
@POST(Constants.POST_CP_GIVE_GIFT)

4
BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
View File

@@ -4072,8 +4072,8 @@ public class RetrofitClient {
});
}
public void roomGift(String room_id, String gift_id, String gift_num, String to_uid, String type, String pit_number, String heart_id, BaseObserver<RoomGiftData> observer) {
sApiServer.roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number, heart_id).enqueue(new Callback<BaseModel<RoomGiftData>>() {
public void roomGift(String room_id, String gift_id, String gift_num, String to_uid, String type, String pit_number, String heart_id,String gift_bag_id, BaseObserver<RoomGiftData> observer) {
sApiServer.roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number, heart_id,gift_bag_id).enqueue(new Callback<BaseModel<RoomGiftData>>() {
@Override
public void onResponse(Call<BaseModel<RoomGiftData>> call, Response<BaseModel<RoomGiftData>> response) {
if (response.code() == 200) {

2
BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftContacts.java
View File

@@ -43,7 +43,7 @@ public class RewardGiftContacts {
void giveGift(String user_id, String gid, String num, String to_uid, String gift_type);
void roomGift(String room_id, String gift_id, String gift_num, String to_uid, String type, String pit_number,String heart_id);
void roomGift(String room_id, String gift_id, String gift_num, String to_uid, String type, String pit_number,String heart_id,String gift_bag_id);
void wallet();

4
BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java
View File

@@ -103,8 +103,8 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
}
@Override
public void roomGift(String room_id, String gift_id, String gift_num, String to_uid, String type, String pit_number, String heart_id) {
RetrofitClient.getInstance().roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number, heart_id, new BaseObserver<RoomGiftData>() {
public void roomGift(String room_id, String gift_id, String gift_num, String to_uid, String type, String pit_number, String heart_id,String gift_bag_id) {
RetrofitClient.getInstance().roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number, heart_id,gift_bag_id, new BaseObserver<RoomGiftData>() {
@Override
public void onSubscribe(Disposable d) {

3
BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java
View File

@@ -288,7 +288,8 @@ public class Constants {
public static final String GET_REDPACKET_DETAIL = "/api/Redpacket/detail";//红包详情
public static final String POST_GRAB = "/api/Redpacket/grab";//抢红包
public static final String GET_ROOM_GIFT = "/api/Room/room_give_gift";//直播间送礼
// public static final String GET_ROOM_GIFT = "/api/Room/room_give_gift";//直播间送礼
public static final String GET_ROOM_GIFT = "/api/SendGift/send_gift";//直播间送礼
public static final String POST_CP_GIVE_GIFT = "/api/UserCp/cpGiveGift";//用户CP礼物回赠
public static final String GET_CP_ZONE = "/api/UserCp/cpZone";//心动空间
public static final String POST_MY_FAMILY = "/api/Family/myFamily";//我的家族

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) {

22
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
View File

@@ -597,7 +597,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
}
return currentItem;
}
private String gift_bag="";
private void giveGift(String num) {
getSelectedGift();
int currentItem = mBinding.viewPager.getCurrentItem();
@@ -647,12 +647,16 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
//礼物打赏
giftNumber = num;
if(roonGiftModel.getActivities_id()==4){
gift_bag=roonGiftModel.getGift_bag()+"";
}
if (userInfo != null) {
if (userInfo.getPit_number() != null) {
if (userInfo.getPit_number().equals("888") || userInfo.getPit_number().equals("")) {
if (userInfo.getPit_number().isEmpty() || jingp != 1) {
roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "");
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "",gift_bag);
} else {
roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, userInfo.getAuction_id());
EventBus.getDefault().post(roomGiftGiveEvent);
@@ -662,17 +666,17 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
}
} else {
roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, heart_id);
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, heart_id,gift_bag);
}
} else {
roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "");
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "",gift_bag);
}
} else {
if (all) {
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", null, "");
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", null, "",gift_bag);
} else {
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "");
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "",gift_bag);
}
roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
}
@@ -680,14 +684,14 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
if (userInfo == null) {
giftNumber = num;
beibaoId = roonGiftModel.getGift_id();
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id);
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id,"");
return;
}
if (userInfo.getPit_number() != null && userInfo.getPit_number().equals("888") || userInfo.getPit_number().equals("")) {
if (userInfo.getPit_number().isEmpty() || jingp != 1) {
giftNumber = num;
beibaoId = roonGiftModel.getGift_id();
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id);
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id,"");
} else {
beibaoId = roonGiftModel.getGift_id();
MvpPre.roomAuctionJoin(userInfo.getAuction_id(), userInfo.getUser_id() + "", roonGiftModel.getGift_id(), num, "2");
@@ -699,7 +703,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
} else {
giftNumber = num;
beibaoId = roonGiftModel.getGift_id();
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id);
MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id,"");
}
} else {

24
MainModule/src/main/java/com/xscm/modulemain/dialog/barRoom/FlirtatiousDialog.kt
View File

@@ -22,11 +22,13 @@ import io.reactivex.disposables.Disposable
* 时间：2026/1/5 15:36
* 用途：撩他提示框
*/
class FlirtatiousDialog(context: Context) :
class FlirtatiousDialog(context: Context, var nickname: String) :
BaseDialog<DialogFlirtatiousBinding>(context, com.xscm.moduleutil.R.style.BaseDialogStyleH) {
// 定义回调接口
private var onConfirmCallback: ((String) -> Unit)? = null
private var mNickName: String = nickname;
private var isSelected: Boolean = false
// 设置回调接口的方法
fun setOnConfirmListener(callback: (String) -> Unit): FlirtatiousDialog {
@@ -50,9 +52,13 @@ class FlirtatiousDialog(context: Context) :
mBinding.ivClose.setOnClickListener {
dismiss()
}
if (SpUtil.getBooleanValue("pub",false)) {
mBinding.vCheckbox.isSelected = true
isSelected = true
}
mBinding.tvConfirm.setOnClickListener {
onConfirmCallback?.invoke("")
SpUtil.setBooleanValue("pub", isSelected)
dismiss()
}
mBinding.tvCancel.setOnClickListener {
@@ -60,16 +66,19 @@ class FlirtatiousDialog(context: Context) :
}
mBinding.vCheckbox.setOnClickListener {
it.isSelected = !it.isSelected
if (it.isSelected) {
SpUtil.setBooleanValue("pub", true)
}
}
isSelected = it.isSelected
}
}
override fun show() {
mBinding.tvTitle.text = "确定要撩一撩台上的 ${mNickName} 吗？共计需要 10个 金币。"
super.show()
}
override fun initData() {
// 初始化数据，如果需要的话
RetrofitClient.getInstance().wallet(object : BaseObserver<WalletBean>(){
RetrofitClient.getInstance().wallet(object : BaseObserver<WalletBean>() {
override fun onSubscribe(d: Disposable) {
}
@@ -78,6 +87,7 @@ class FlirtatiousDialog(context: Context) :
})
}
private fun setupWindow() {
val window = window ?: return
window.setGravity(Gravity.CENTER)

9
MainModule/src/main/java/com/xscm/modulemain/widget/RoomPubWheatView.kt
View File

@@ -12,6 +12,7 @@ import android.widget.TextView
import com.xscm.modulemain.R
import com.xscm.moduleutil.bean.room.RoomPitBean
import com.xscm.moduleutil.utils.ImageUtils
import com.xscm.moduleutil.widget.AvatarFrameView
import com.xscm.moduleutil.widget.BaseWheatView
class RoomPubWheatView : BaseWheatView {
@@ -32,7 +33,7 @@ class RoomPubWheatView : BaseWheatView {
private var hostTv: TextView? = null
private var tv_time: TextView? = null
private var ll_bottom: LinearLayout? = null
private var iv_gift: AvatarFrameView? = null
var ivYueT: ImageView? = null
var ivLiaoT: ImageView? = null
@@ -61,6 +62,7 @@ class RoomPubWheatView : BaseWheatView {
ivYueT = findViewById(R.id.iv_yue_t)
ivLiaoT = findViewById(R.id.iv_liao_t)
iv_gift = findViewById(R.id.iv_gift)
}
@@ -117,7 +119,10 @@ class RoomPubWheatView : BaseWheatView {
fun setSex(value: String?, format: Boolean) {
mCharmView.setSex("", "", value, format)
}
fun setPitGift(giftPlayString: String){
iv_gift?.visibility=VISIBLE
iv_gift?.setSource(giftPlayString, 2)
}
private fun handleOnState(bean: RoomPitBean) {
mIvRipple.visibility = VISIBLE

2
MainModule/src/main/res/layout/layout_room_pub_wheat.xml
View File

@@ -60,7 +60,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="0.6" />
<ImageView
<com.xscm.moduleutil.widget.AvatarFrameView
android:id="@+id/iv_gift"
android:layout_width="0dp"
android:layout_height="0dp"