签约视图高度and闪退修改 62

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<RewardGiftContacts.View>
 
     @Override
     public void getRewardList(String id, int page, int page_limit) {
-        api.getRewardList(id, page, page_limit, new BaseObserver<List<RewardUserBean>>() {
+        RetrofitClient.getInstance().getRewardList(id, page, page_limit, new BaseObserver<List<RewardUserBean>>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);
@@ -46,7 +47,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void getGiftLabel(String have_hot) {
-        api.getGiftLabel(have_hot, new BaseObserver<List<GiftLabelBean>>() {
+        RetrofitClient.getInstance().getGiftLabel(have_hot, new BaseObserver<List<GiftLabelBean>>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);
@@ -65,7 +66,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void getGiftList(String id, int type, String roomId) {
-        api.getGiftList(Integer.parseInt(id), roomId, new BaseObserver<List<RoonGiftModel>>() {
+        RetrofitClient.getInstance().getGiftList(Integer.parseInt(id), roomId, new BaseObserver<List<RoonGiftModel>>() {
 
             @Override
             public void onSubscribe(Disposable d) {
@@ -84,7 +85,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @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<String>() {
+        RetrofitClient.getInstance().giveGift(user_id, gid, num, to_uid, gift_type, new BaseObserver<String>() {
 
             @Override
             public void onSubscribe(Disposable d) {
@@ -103,7 +104,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @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<RoomGiftData>() {
+        RetrofitClient.getInstance().roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number, heart_id, new BaseObserver<RoomGiftData>() {
 
             @Override
             public void onSubscribe(Disposable d) {
@@ -122,7 +123,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void wallet() {
-        api.wallet(new BaseObserver<WalletBean>() {
+        RetrofitClient.getInstance().wallet(new BaseObserver<WalletBean>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);
@@ -140,7 +141,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @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<String>() {
+        RetrofitClient.getInstance().reward_zone(id, gift_id, num, is_pack, new BaseObserver<String>() {
 
             @Override
             public void onSubscribe(Disposable d) {
@@ -159,7 +160,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void setRoomApply(String room_id, String gift_id, String gift_price) {
-        api.setRoomApply(room_id, gift_id, gift_price, new BaseObserver<String>() {
+        RetrofitClient.getInstance().setRoomApply(room_id, gift_id, gift_price, new BaseObserver<String>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);
@@ -177,7 +178,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @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<RoomAuction.AuctionListBean>() {
+        RetrofitClient.getInstance().roomAuctionJoin(auction_id, user_id, gift_id, num, type, new BaseObserver<RoomAuction.AuctionListBean>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);
@@ -195,7 +196,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void giftPack() {
-        api.giftPack(new BaseObserver<List<GiftPackBean>>() {
+        RetrofitClient.getInstance().giftPack(new BaseObserver<List<GiftPackBean>>() {
 
             @Override
             public void onSubscribe(Disposable d) {
@@ -217,7 +218,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void getGiftPack(String roomId, String userId, String heart_id, String auction_id) {
-        api.getGiftPack(roomId, userId, heart_id, auction_id, new BaseObserver<String>() {
+        RetrofitClient.getInstance().getGiftPack(roomId, userId, heart_id, auction_id, new BaseObserver<String>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);
@@ -239,7 +240,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void getGiftPackListCount() {
-        api.getGiftPackListCount(new BaseObserver<GiftPackListCount>() {
+        RetrofitClient.getInstance().getGiftPackListCount(new BaseObserver<GiftPackListCount>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);

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

@@ -3926,6 +3926,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             maxHeightDp = 373
         } else if (mRoomInfoResp!!.room_info.type_id == "9") {
             maxHeightDp = 373
+        } else if (mRoomInfoResp!!.room_info.type_id == "10"){
+            maxHeightDp = 333
         }
         adjustLayoutHeights()
     }

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