From 2756fdb4b7a046f958ce6bcc371c15b2d6f99751 Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Thu, 4 Dec 2025 21:13:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E7=BA=A6=E8=A7=86=E5=9B=BE=E9=AB=98?= =?UTF-8?q?=E5=BA=A6and=E9=97=AA=E9=80=80=E4=BF=AE=E6=94=B9=2062?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presenter/RewardGiftPresenter.java | 25 ++++++++++--------- .../activity/room/activity/RoomActivity.kt | 2 ++ gradle.properties | 4 +-- 3 files changed, 17 insertions(+), 14 deletions(-) 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 12093a66..60962692 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java @@ -11,6 +11,7 @@ import com.xscm.moduleutil.bean.RoonGiftModel; import com.xscm.moduleutil.bean.WalletBean; import com.xscm.moduleutil.bean.room.RoomAuction; import com.xscm.moduleutil.http.BaseObserver; +import com.xscm.moduleutil.http.RetrofitClient; import java.lang.ref.WeakReference; import java.util.List; @@ -27,7 +28,7 @@ public class RewardGiftPresenter extends BasePresenter @Override public void getRewardList(String id, int page, int page_limit) { - api.getRewardList(id, page, page_limit, new BaseObserver>() { + RetrofitClient.getInstance().getRewardList(id, page, page_limit, new BaseObserver>() { @Override public void onSubscribe(Disposable d) { addDisposable(d); @@ -46,7 +47,7 @@ public class RewardGiftPresenter extends BasePresenter @Override public void getGiftLabel(String have_hot) { - api.getGiftLabel(have_hot, new BaseObserver>() { + RetrofitClient.getInstance().getGiftLabel(have_hot, new BaseObserver>() { @Override public void onSubscribe(Disposable d) { addDisposable(d); @@ -65,7 +66,7 @@ public class RewardGiftPresenter extends BasePresenter @Override public void getGiftList(String id, int type, String roomId) { - api.getGiftList(Integer.parseInt(id), roomId, new BaseObserver>() { + RetrofitClient.getInstance().getGiftList(Integer.parseInt(id), roomId, new BaseObserver>() { @Override public void onSubscribe(Disposable d) { @@ -84,7 +85,7 @@ public class RewardGiftPresenter extends BasePresenter @Override public void giveGift(String user_id, String gid, String num, String to_uid, String gift_type) { - api.giveGift(user_id, gid, num, to_uid, gift_type, new BaseObserver() { + RetrofitClient.getInstance().giveGift(user_id, gid, num, to_uid, gift_type, new BaseObserver() { @Override public void onSubscribe(Disposable d) { @@ -103,7 +104,7 @@ public class RewardGiftPresenter extends BasePresenter @Override public void roomGift(String room_id, String gift_id, String gift_num, String to_uid, String type, String pit_number, String heart_id) { - api.roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number, heart_id, new BaseObserver() { + RetrofitClient.getInstance().roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number, heart_id, new BaseObserver() { @Override public void onSubscribe(Disposable d) { @@ -122,7 +123,7 @@ public class RewardGiftPresenter extends BasePresenter @Override public void wallet() { - api.wallet(new BaseObserver() { + RetrofitClient.getInstance().wallet(new BaseObserver() { @Override public void onSubscribe(Disposable d) { addDisposable(d); @@ -140,7 +141,7 @@ public class RewardGiftPresenter extends BasePresenter @Override public void reward_zone(String id, String gift_id, String num, String is_pack) { - api.reward_zone(id, gift_id, num, is_pack, new BaseObserver() { + RetrofitClient.getInstance().reward_zone(id, gift_id, num, is_pack, new BaseObserver() { @Override public void onSubscribe(Disposable d) { @@ -159,7 +160,7 @@ public class RewardGiftPresenter extends BasePresenter @Override public void setRoomApply(String room_id, String gift_id, String gift_price) { - api.setRoomApply(room_id, gift_id, gift_price, new BaseObserver() { + RetrofitClient.getInstance().setRoomApply(room_id, gift_id, gift_price, new BaseObserver() { @Override public void onSubscribe(Disposable d) { addDisposable(d); @@ -177,7 +178,7 @@ public class RewardGiftPresenter extends BasePresenter @Override public void roomAuctionJoin(String auction_id, String user_id, String gift_id, String num, String type) { - api.roomAuctionJoin(auction_id, user_id, gift_id, num, type, new BaseObserver() { + RetrofitClient.getInstance().roomAuctionJoin(auction_id, user_id, gift_id, num, type, new BaseObserver() { @Override public void onSubscribe(Disposable d) { addDisposable(d); @@ -195,7 +196,7 @@ public class RewardGiftPresenter extends BasePresenter @Override public void giftPack() { - api.giftPack(new BaseObserver>() { + RetrofitClient.getInstance().giftPack(new BaseObserver>() { @Override public void onSubscribe(Disposable d) { @@ -217,7 +218,7 @@ public class RewardGiftPresenter extends BasePresenter @Override public void getGiftPack(String roomId, String userId, String heart_id, String auction_id) { - api.getGiftPack(roomId, userId, heart_id, auction_id, new BaseObserver() { + RetrofitClient.getInstance().getGiftPack(roomId, userId, heart_id, auction_id, new BaseObserver() { @Override public void onSubscribe(Disposable d) { addDisposable(d); @@ -239,7 +240,7 @@ public class RewardGiftPresenter extends BasePresenter @Override public void getGiftPackListCount() { - api.getGiftPackListCount(new BaseObserver() { + RetrofitClient.getInstance().getGiftPackListCount(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 b31b302b..2c59c3e0 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 @@ -3926,6 +3926,8 @@ class RoomActivity : BaseMvpActivity(), maxHeightDp = 373 } else if (mRoomInfoResp!!.room_info.type_id == "9") { maxHeightDp = 373 + } else if (mRoomInfoResp!!.room_info.type_id == "10"){ + maxHeightDp = 333 } adjustLayoutHeights() } diff --git a/gradle.properties b/gradle.properties index f42ac63a..e6412250 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,8 +28,8 @@ isBuildModule=false #org.gradle.deamon=false android.injected.testOnly=false -APP_VERSION_NAME=1.0.7.1 -APP_VERSION_CODE=61 +APP_VERSION_NAME=1.0.7.2 +APP_VERSION_CODE=62 org.gradle.jvm.toolchain.useLegacyAdapters=false #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15