YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1：修改送盲盒的时候，接口修改，需要传递gift_bag_id

Browse Source 
2：装扮详情修改优化
This commit is contained in:
梁小江
2026-01-17 16:28:20 +08:00
parent 838a2ec64a
commit 16bd6d7e1a
7 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -873,7 +873,7 @@ public interface ApiServer {
@FormUrlEncoded
@POST(Constants.POST_ROOM_AUCTION_JOIN)
Call<BaseModel<RoomAuction.AuctionListBean>> 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<BaseModel<RoomAuction.AuctionListBean>> 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

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

@@ -3864,8 +3864,8 @@ public class RetrofitClient {
}
public void roomAuctionJoin(String auctionId, String userId, String giftId, String
num, String type, BaseObserver<RoomAuction.AuctionListBean> observer) {
sApiServer.roomAuctionJoin(auctionId, userId, giftId, num, type)
num, String type,String gift_bag_id, BaseObserver<RoomAuction.AuctionListBean> observer) {
sApiServer.roomAuctionJoin(auctionId, userId, giftId, num, type,gift_bag_id)
// .enqueue(new ApiResponseCallback<RoomAuction.AuctionListBean>(CommonAppContext.getInstance()) {
// @Override
// public void onSuccess(RoomAuction.AuctionListBean data) {

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

@@ -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 );

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

@@ -177,8 +177,8 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
}
@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<RoomAuction.AuctionListBean>() {
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<RoomAuction.AuctionListBean>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);

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

@@ -1172,6 +1172,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
giftGiveEvent!!.getRoonGiftModel().gift_id,
giftGiveEvent!!.getNum(),
"1",
giftGiveEvent?.getRoonGiftModel()?.gift_bag?.toString() ?: "",
object : BaseObserver<AuctionListBean?>() {
override fun onSubscribe(d: Disposable) {
// showGiftGiveProgress();

1
MainModule/src/main/java/com/xscm/modulemain/dialog/PurchaseOutfitsDialog.kt
View File

@@ -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

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

@@ -666,7 +666,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, userInfo.getAuction_id());
EventBus.getDefault().post(roomGiftGiveEvent);
roomGiftGiveEvent = null;
MvpPre.roomAuctionJoin(userInfo.getAuction_id(), userInfo.getUser_id() + "", roonGiftModel.getGift_id(), num, "1");
MvpPre.roomAuctionJoin(userInfo.getAuction_id(), userInfo.getUser_id() + "", roonGiftModel.getGift_id(), num, "1",gift_bag);
dismiss();
}
} else {
@@ -699,7 +699,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
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");
MvpPre.roomAuctionJoin(userInfo.getAuction_id(), userInfo.getUser_id() + "", roonGiftModel.getGift_id(), num, "2", gift_bag);
roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, userInfo.getAuction_id());
EventBus.getDefault().post(roomGiftGiveEvent);
roomGiftGiveEvent = null;