From 16bd6d7e1abd79675abe6cbea767fcd1befb0370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Sat, 17 Jan 2026 16:28:20 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=80=81=E7=9B=B2?= =?UTF-8?q?=E7=9B=92=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=9C=80=E8=A6=81=E4=BC=A0=E9=80=92?= =?UTF-8?q?gift=5Fbag=5Fid=202=EF=BC=9A=E8=A3=85=E6=89=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xscm/moduleutil/http/ApiServer.java | 2 +- .../main/java/com/xscm/moduleutil/http/RetrofitClient.java | 4 ++-- .../com/xscm/moduleutil/presenter/RewardGiftContacts.java | 2 +- .../com/xscm/moduleutil/presenter/RewardGiftPresenter.java | 4 ++-- .../xscm/modulemain/activity/room/activity/RoomActivity.kt | 1 + .../java/com/xscm/modulemain/dialog/PurchaseOutfitsDialog.kt | 1 + .../com/xscm/modulemain/dialog/RoomGiftDialogFragment.java | 4 ++-- 7 files changed, 10 insertions(+), 8 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 60f1e7dc..00326489 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java @@ -873,7 +873,7 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.POST_ROOM_AUCTION_JOIN) - Call> roomAuctionJoin(@Field("auction_id") String auction_id, @Field("user_id") String user_id, @Field("gift_id") String gift_id, @Field("num") String num, @Field("type") String type); + Call> roomAuctionJoin(@Field("auction_id") String auction_id, @Field("user_id") String user_id, @Field("gift_id") String gift_id, @Field("num") String num, @Field("type") String type,@Field("gift_bag_id") String gift_bag_id); @FormUrlEncoded 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 22485201..dafa7b4f 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -3864,8 +3864,8 @@ public class RetrofitClient { } public void roomAuctionJoin(String auctionId, String userId, String giftId, String - num, String type, BaseObserver observer) { - sApiServer.roomAuctionJoin(auctionId, userId, giftId, num, type) + num, String type,String gift_bag_id, BaseObserver observer) { + sApiServer.roomAuctionJoin(auctionId, userId, giftId, num, type,gift_bag_id) // .enqueue(new ApiResponseCallback(CommonAppContext.getInstance()) { // @Override // public void onSuccess(RoomAuction.AuctionListBean data) { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftContacts.java b/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftContacts.java index 544274c9..4842bfa3 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftContacts.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftContacts.java @@ -51,7 +51,7 @@ public class RewardGiftContacts { void setRoomApply(String room_id, String gift_id,String gift_price); - void roomAuctionJoin(String auction_id,String user_id, String gift_id, String num,String type); + void roomAuctionJoin(String auction_id,String user_id, String gift_id, String num,String type,String gift_bag_id); void giftPack(); void getGiftPack(String roomId,String userId,String heart_id,String auction_id ); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java b/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java index fd47a119..21aa53e8 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java @@ -177,8 +177,8 @@ public class RewardGiftPresenter extends BasePresenter } @Override - public void roomAuctionJoin(String auction_id, String user_id, String gift_id, String num, String type) { - RetrofitClient.getInstance().roomAuctionJoin(auction_id, user_id, gift_id, num, type, new BaseObserver() { + public void roomAuctionJoin(String auction_id, String user_id, String gift_id, String num, String type,String gift_bg) { + RetrofitClient.getInstance().roomAuctionJoin(auction_id, user_id, gift_id, num, type,gift_bg, new BaseObserver() { @Override public void onSubscribe(Disposable d) { addDisposable(d); 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 6141733f..1779db95 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 @@ -1172,6 +1172,7 @@ class RoomActivity : BaseMvpActivity(), giftGiveEvent!!.getRoonGiftModel().gift_id, giftGiveEvent!!.getNum(), "1", + giftGiveEvent?.getRoonGiftModel()?.gift_bag?.toString() ?: "", object : BaseObserver() { override fun onSubscribe(d: Disposable) { // showGiftGiveProgress(); diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/PurchaseOutfitsDialog.kt b/MainModule/src/main/java/com/xscm/modulemain/dialog/PurchaseOutfitsDialog.kt index de1d423c..b5205a17 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/PurchaseOutfitsDialog.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/PurchaseOutfitsDialog.kt @@ -169,6 +169,7 @@ class PurchaseOutfitsDialog(context: Context) : mBinding.imageHeadPortrait.visibility= View.VISIBLE imageBg2!!.visibility = View.GONE mBinding.imageHeadPortrait.stopAll() + mBinding.imageHeadPortrait.clearQueue() mBinding.imageHeadPortrait.setSource(personaltyListBean?.play_image, 1) }else if (personaltyListBean?.type == 2) { mBinding.imageHeadPortrait.visibility= View.GONE diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java index a03f6c35..aee2fe34 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java @@ -666,7 +666,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment