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 f4d24388..5422c35c 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -3047,7 +3047,9 @@ public class RetrofitClient { } } else if (baseModel.getCode() == 0) { ToastUtils.showShort(baseModel.getMsg()); - observer.onNext(baseModel.getData()); + if (baseModel.getData() != null) { + observer.onNext(baseModel.getData()); + } } else if (baseModel.getCode() == 301) { try { ToastUtils.showShort(baseModel.getMsg()); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/GiftAnimView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/GiftAnimView.java index be04d54b..1cd86464 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/GiftAnimView.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/GiftAnimView.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.locks.ReentrantLock; +import lombok.Getter; import lombok.Setter; import okhttp3.Call; import okhttp3.Callback; @@ -40,6 +41,7 @@ public class GiftAnimView extends FrameLayout implements GiftSvgaView.OnAnimatio private ReentrantLock lock = new ReentrantLock(); private List giftArray = new ArrayList<>(); @Setter + @Getter public ExecutorService queue; private Context mContext; private boolean isOnece; diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/QXGiftPlayerManager.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/QXGiftPlayerManager.java index 84e9747e..4c784d86 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/QXGiftPlayerManager.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/QXGiftPlayerManager.java @@ -98,6 +98,13 @@ public class QXGiftPlayerManager { } public void displayFullEffectView1(List stringList){ + if (getDefaultFullEffectView().getQueue() == null){ + // 创建专用线程池替代GCD队列 + ExecutorService queue = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(), + Executors.defaultThreadFactory()); + fullEffectView.setQueue(queue); + } getDefaultFullEffectView().displayEffectView1(stringList); } 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 f89a9e63..48c7afc5 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 @@ -2850,6 +2850,8 @@ class RoomActivity : BaseMvpActivity(), return } switchMic(2) + }else{ + mBinding?.ivSoundEffects?.visibility = View.GONE } } else { if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id) == RoomType.JUKEBOX diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RedBagSendDialog.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RedBagSendDialog.java index bf641227..d1286ca2 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RedBagSendDialog.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RedBagSendDialog.java @@ -134,7 +134,7 @@ public class RedBagSendDialog extends BaseDialog { int num = Integer.parseInt(numStr); int text = Integer.parseInt(textStr); - if (text <= num) { + if (text < num) { diaj=false; ToastUtils.show("金额必须大于数量"); return; @@ -281,7 +281,7 @@ public class RedBagSendDialog extends BaseDialog { int num = Integer.parseInt(numStr); int text = Integer.parseInt(textStr); - if (text <= num) { + if (text < num) { diaj=false; ToastUtils.show("金额必须大于数量"); return;