Merge branch 'branch_new_dev' into branch_new

This commit is contained in:
2025-11-27 11:53:16 +08:00
22 changed files with 271 additions and 193 deletions

View File

@@ -2,6 +2,9 @@ package com.xscm.moduleutil.dialog.giftLottery;
import android.content.Context;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.LogUtils;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.GiftBean;
import com.xscm.moduleutil.bean.WalletBean;
import com.xscm.moduleutil.bean.blindboxwheel.BlindBoxBean;
@@ -134,6 +137,12 @@ public class GiftLotteryPresenter extends BasePresenter<GiftLotteryContacts.View
public void xlh(String room_id) {
// api.xlh(room_id, new BaseObserver<String>() {)
if (room_id == null ||room_id.isEmpty()){
LogUtils.e("xlh room_id is null" + CommonAppContext.getInstance().playId);
room_id = CommonAppContext.getInstance().playId;
}
api.getBoxGiftListXLH(room_id, new BaseObserver<BlindBoxBean>() {
@Override
public void onSubscribe(Disposable d) {
@@ -155,6 +164,12 @@ public class GiftLotteryPresenter extends BasePresenter<GiftLotteryContacts.View
if (api==null){
api= RetrofitClient.getInstance();
}
if (room_id == null ||room_id.isEmpty()){
LogUtils.e("xlhChou room_id is null" + CommonAppContext.getInstance().playId);
room_id = CommonAppContext.getInstance().playId;
}
api.xlhChou(room_id,num, new BaseObserver<List<XlhDrawBean>>() {
@Override