From 5f7bac8a12ec94d42ef53fda4293560356e1b935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Wed, 7 Jan 2026 17:13:33 +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?=E4=B8=8A=E9=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xscm/moduleutil/http/ApiServer.java | 2 +- .../xscm/moduleutil/http/RetrofitClient.java | 8 +++---- .../activity/room/contacts/PubContacts.kt | 2 +- .../activity/room/fragment/RoomPubFragment.kt | 4 ++-- .../activity/room/presenter/PubPresenter.kt | 22 +++++++++---------- .../dialog/barRoom/WishGiftDialog.kt | 11 +++++++++- 6 files changed, 29 insertions(+), 20 deletions(-) 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 8dcfffcf..ef8a880c 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java @@ -661,7 +661,7 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.APPLY_PIT) - Call> applyPit(@Field("room_id") String room_id, @Field("pit_number") String pit_number); + Call> applyPit(@Field("room_id") String room_id, @Field("pit_number") String pit_number,@Field("gift_id")String gift_id); @FormUrlEncoded @POST(Constants.START_FRIEND) 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 e822675c..6564871d 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -4221,7 +4221,7 @@ public class RetrofitClient { } public void applyPit(String roomId, String pitNumber, BaseObserver observer) { - sApiServer.applyPit(roomId, pitNumber).enqueue(new Callback>() { + sApiServer.applyPit(roomId, pitNumber,"").enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { onNextRetu(response, observer); @@ -4234,9 +4234,9 @@ public class RetrofitClient { }); } - // TODO: 2026/1/7 - public void applyPubPit(String roomId, String pitNumber, BaseObserver observer) { - sApiServer.applyPit(roomId, pitNumber).enqueue(new Callback>() { + // TODO: 2026/1/7 修改了上麦接口，这里重新写一个，是只针对酒吧房使用的 + public void applyPubPit(String roomId, String pitNumber,String gift_id, BaseObserver observer) { + sApiServer.applyPit(roomId, pitNumber,gift_id).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { onNextRetu(response, observer); diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/PubContacts.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/PubContacts.kt index 93eaa352..f8bba9d5 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/PubContacts.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/PubContacts.kt @@ -14,7 +14,7 @@ class PubContacts { } interface Ipre : IPresenter{ - fun applyPit(roomId:String,pitNumber:String) + fun applyPit(roomId:String,pitNumber:String,giftId: String) diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt index 3feb0430..763bdff3 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt @@ -145,8 +145,8 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) : } 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) + WishGiftDialog(ActivityUtils.getTopActivity(),mRoomId).show() +// MvpPre!!.applyPit(mRoomInfoResp?.room_info?.room_id!!, view.pitNumber) } else { RoomUserInfoFragment.show( mRoomInfoResp?.room_info?.room_id, diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/PubPresenter.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/PubPresenter.kt index 5e10bff8..beb2c79c 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/PubPresenter.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/PubPresenter.kt @@ -14,20 +14,21 @@ import java.lang.ref.WeakReference class PubPresenter(context: Context, val view: PubContacts.View?) : BasePresenter(view, context), PubContacts.Ipre { - override fun applyPit(roomId: String, pitNumber: String) { - RetrofitClient.getInstance().applyPit(roomId, pitNumber, object : BaseObserver() { - override fun onSubscribe(d: Disposable) { - addDisposable(d) - } + override fun applyPit(roomId: String, pitNumber: String, giftId: String) { + RetrofitClient.getInstance() + .applyPubPit(roomId, pitNumber, giftId, object : BaseObserver() { + override fun onSubscribe(d: Disposable) { + addDisposable(d) + } - override fun onNext(s: String) { + override fun onNext(s: String) { - } - }) + } + }) } - override fun wallet(list:List) { + override fun wallet(list: List) { RetrofitClient.getInstance().wallet(object : BaseObserver() { override fun onSubscribe(d: Disposable) { addDisposable(d) @@ -37,11 +38,10 @@ class PubPresenter(context: Context, val view: PubContacts.View?) : if (MvpRef == null) { MvpRef = WeakReference(view) } - MvpRef.get()?.wallet(list,walletBean) + MvpRef.get()?.wallet(list, walletBean) } }) } - } \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/barRoom/WishGiftDialog.kt b/MainModule/src/main/java/com/xscm/modulemain/dialog/barRoom/WishGiftDialog.kt index 1463977e..d6c6cc30 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/barRoom/WishGiftDialog.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/barRoom/WishGiftDialog.kt @@ -45,7 +45,16 @@ class WishGiftDialog(context: Context, val roomId: String) : // (ActivityUtils.getTopActivity() as? RoomActivity)?.let { roomActivity -> // roomActivity.dialogMessage(messageEvent) // } - dismiss() + RetrofitClient.getInstance().applyPubPit(roomId,"",adapter?.getSelectedValue()?.gift_id,object : BaseObserver() { + override fun onSubscribe(d: Disposable) { + } + + override fun onNext(t: String) { + dismiss() + } + + }) + } }