From 8db507718cd83d312ee8d3ebd709607771337ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Mon, 26 Jan 2026 14:18:07 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=92=8C=E7=A4=BC=E7=89=A9=E6=9C=89=E5=85=B3=E7=B3=BB=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=88=86=E5=88=AB=E6=98=AF=E6=89=93?= =?UTF-8?q?=E8=B5=8F=E6=8E=A5=E5=8F=A3=E3=80=81=E6=88=BF=E9=97=B4=E7=A4=BC?= =?UTF-8?q?=E7=89=A9=EF=BC=8C=E8=BF=99=E4=B8=AA=E8=BF=9B=E8=A1=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=202=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8E=92=E9=BA=A6?= =?UTF-8?q?=E6=8F=92=E9=98=9F=E7=A4=BC=E7=89=A9=EF=BC=8Cid=E4=BC=A00=203?= =?UTF-8?q?=EF=BC=9A=E6=AD=8C=E5=8D=95=E7=A4=BC=E7=89=A9=E4=BC=A0=E9=80=92?= =?UTF-8?q?=E7=9A=84id=E6=98=AF100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/GiftTwoDetailsFragment.java | 2 +- .../com/xscm/moduleutil/http/ApiServer.java | 2 +- .../xscm/moduleutil/http/RetrofitClient.java | 18 ++++++++++++++++-- .../presenter/RewardGiftPresenter.java | 4 ++-- .../dialog/RewardGiftDialogFragment.java | 14 +++++++------- .../xscm/modulemain/dialog/GiftSongDialog.java | 3 ++- .../dialog/RoomGiftDialogFragment.java | 5 ----- .../src/main/res/layout/item_user_playlist.xml | 2 +- 8 files changed, 30 insertions(+), 20 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java index d831f89e..6048da9d 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java @@ -108,7 +108,7 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment>> getRewardList(@Field("id") String id, @Field("page") String page, @Field("page_limit") String page_limit); @GET(Constants.GET_GIFT_LABEL) - Call>> getGiftLabel(@Query("have_hot") String have_hot); + Call>> getGiftLabel(@Query("type") String type); //获取礼物列表 @GET(Constants.GIFT_LIST) 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 56ec3312..d7afbd3e 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -2324,8 +2324,14 @@ public class RetrofitClient { }); } - public void getGiftLabel(String have_hot, BaseObserver> observer) { - sApiServer.getGiftLabel(have_hot).enqueue(new Callback>>() { + /** + * 礼物标签表 + * @param type 1：房间获取标签 2：打赏，不要热度卡 3： + * @param observer + */ + + public void getGiftLabel(String type, BaseObserver> observer) { + sApiServer.getGiftLabel(type).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { if (response.code() == 200) { @@ -2349,6 +2355,13 @@ public class RetrofitClient { }); } + /** + * 获取礼物列表 + * @param type 0:只获取热门礼物和普通礼物 99：拍卖卡关系选择礼物 100：歌单礼物 + * @param roomId + * @param observer + */ + public void getGiftList(int type, String roomId, BaseObserver> observer) { sApiServer.getGiftList(type, roomId).enqueue(new Callback>>() { @Override @@ -2363,6 +2376,7 @@ public class RetrofitClient { setCode301(listBaseModel.getMsg()); } } else { + ToastUtils.showLong("礼物数据错误", response.code()); LogUtils.e("getGiftList", response.message()); } } 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 b6574f16..e4efcd87 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java @@ -46,8 +46,8 @@ public class RewardGiftPresenter extends BasePresenter } @Override - public void getGiftLabel(String have_hot) { - RetrofitClient.getInstance().getGiftLabel(have_hot, new BaseObserver>() { + public void getGiftLabel(String type) { + RetrofitClient.getInstance().getGiftLabel(type, new BaseObserver>() { @Override public void onSubscribe(Disposable d) { addDisposable(d); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java index 18d81283..00bb2e61 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java @@ -103,7 +103,7 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment(); mGiftNumList.add(new GiftNumBean("20", "x20")); @@ -206,12 +206,12 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment giftLabelBeans) { if (giftLabelBeans == null) return; - for (GiftLabelBean giftLabelBean1 : giftLabelBeans) { - if (giftLabelBean1.getId().equals("2")) { - giftLabelBeans.remove(giftLabelBean1); - break; - } - } +// for (GiftLabelBean giftLabelBean1 : giftLabelBeans) { +// if (giftLabelBean1.getId().equals("2")) { +// giftLabelBeans.remove(giftLabelBean1); +// break; +// } +// } mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getChildFragmentManager(), giftLabelBeans, fragmentList, "")); mBinding.slidingTabLayout.setViewPager(mBinding.viewPager); diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftSongDialog.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftSongDialog.java index aeede20a..0c8c49cf 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftSongDialog.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftSongDialog.java @@ -135,7 +135,7 @@ public class GiftSongDialog extends BaseDialog { mGiftNumList.add(new GiftNumBean("5", "x5")); mGiftNumList.add(new GiftNumBean("1", "x1")); - RetrofitClient.getInstance().getGiftList(0,"",new BaseObserver>() { + RetrofitClient.getInstance().getGiftList(100,"",new BaseObserver>() { @Override public void onSubscribe(Disposable d) { @@ -147,6 +147,7 @@ public class GiftSongDialog extends BaseDialog { giftList= roonGiftModels; roomAdapter = new GiftRoomAdapter(CommonAppContext.getInstance(), roonGiftModels, 0, "0"); mBinding.rvGift.setAdapter(roomAdapter); + roomAdapter.setNewData(roonGiftModels); } }); } 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 b7207240..26c01163 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java @@ -847,11 +847,6 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment