Merge remote-tracking branch 'origin/branch_new' into branch_new

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());

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<String> giftArray = new ArrayList<>();
     @Setter
+    @Getter
     public ExecutorService queue;
     private Context mContext;
     private boolean isOnece;

BaseModule/src/main/java/com/xscm/moduleutil/widget/QXGiftPlayerManager.java

@@ -98,6 +98,13 @@ public class QXGiftPlayerManager {
     }
 
     public void displayFullEffectView1(List<String> stringList){
+        if (getDefaultFullEffectView().getQueue() == null){
+            // 创建专用线程池替代GCD队列
+            ExecutorService queue = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS,
+                    new LinkedBlockingQueue<Runnable>(),
+                    Executors.defaultThreadFactory());
+            fullEffectView.setQueue(queue);
+        }
         getDefaultFullEffectView().displayEffectView1(stringList);
     }
 

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

@@ -2850,6 +2850,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                     return
                 }
                 switchMic(2)
+            }else{
+                mBinding?.ivSoundEffects?.visibility = View.GONE
             }
         } else {
             if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id) == RoomType.JUKEBOX

MainModule/src/main/java/com/xscm/modulemain/dialog/RedBagSendDialog.java

@@ -134,7 +134,7 @@ public class RedBagSendDialog extends BaseDialog<DialogRedBagSendBinding> {
                         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<DialogRedBagSendBinding> {
             int num = Integer.parseInt(numStr);
             int text = Integer.parseInt(textStr);
 
-            if (text <= num) {
+            if (text < num) {
                 diaj=false;
                 ToastUtils.show("金额必须大于数量");
                 return;