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 3fec0746..acb9503e 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -5556,8 +5556,7 @@ public class RetrofitClient {
     }
 
     /// 巡乐会抽奖
-    public void xlhChou(String roomId, String
-            num, BaseObserver<List<XlhDrawBean>> observer) {
+    public void xlhChou(String roomId, String num, BaseObserver<List<XlhDrawBean>> observer) {
         sApiServer.xlhChou(roomId, num).enqueue(new Callback<BaseModel<List<XlhDrawBean>>>() {
             @Override
             public void onResponse(Call<BaseModel<List<XlhDrawBean>>> call, Response<BaseModel<List<XlhDrawBean>>> response) {
@@ -5570,7 +5569,7 @@ public class RetrofitClient {
                     } else if (baseModel.getCode() == 301) {
                         setCode301(baseModel.getMsg());
                     } else {
-                        observer.onNext(new ArrayList<>());
+//                        observer.onNext(new ArrayList<>());
                         ToastUtils.showShort(baseModel.getMsg());
                     }
 
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java b/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java
index 5ebc804b..4904a28f 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java
@@ -197,7 +197,7 @@ public class AgoraManager {
                 config.mAppId = appId;
                 config.mEventHandler = getDefaultEventHandler();
                 config.mChannelProfile = Constants.CHANNEL_PROFILE_LIVE_BROADCASTING;
-                config.mAudioScenario = Constants.AUDIO_SCENARIO_CHORUS;
+                config.mAudioScenario = Constants.AUDIO_SCENARIO_GAME_STREAMING;
                 config.mAreaCode = 1;
 
                 rtcEngine = (RtcEngineEx) RtcEngine.create(config);
diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_nc.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_nc.png
new file mode 100644
index 00000000..c9a09fd7
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_nc.png differ
diff --git a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
index e535287f..9657ff8a 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
@@ -749,6 +749,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
                         isRedPacketMediaPrepared = true;
                         mp.start();
                     });
+                    redPacketMediaPlayer.setVolume(0.2f, 0.2f); // 设置音量
                     redPacketMediaPlayer.setOnCompletionListener(mp -> {
                         // 播放完成后重置，以便下次重新播放
                         try {
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 f9f0f8e1..27011d13 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
@@ -1661,6 +1661,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
     private fun goneAll() {
         if (mRoomInfoResp?.room_info?.label_id == "11") {
             mBinding?.clDayTask?.visibility= View.GONE
+            mBinding?.xlhRk?.visibility= View.GONE
         }else{
             mBinding?.clDayTask?.visibility= View.VISIBLE
         }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java
index 7fca5a1c..6cdc1e0b 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java
@@ -759,6 +759,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
                 // 从assets目录加载音频文件
                 AssetFileDescriptor afd = getContext().getAssets().openFd(fileName);
                 player = new MediaPlayer();
+                player.setVolume(0.2f,0.2f);
                 player.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
                 player.prepare();
             } catch (IOException e) {
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 9a0ec864..e13d65bc 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
@@ -472,8 +472,10 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
                 "确认",
                 "取消",
                 v -> {
-                    // 点击“确认”按钮时执行删除操作
-                    MvpPre.getGiftPack(roomId, gifyuseradapter.getUserIdToString(), heart_id, auction_id);
+                    if (gifyuseradapter.getUserIdToString() != null) {
+                        // 点击“确认”按钮时执行删除操作
+                        MvpPre.getGiftPack(roomId, gifyuseradapter.getUserIdToString(), heart_id, auction_id);
+                    }
                 },
                 v -> {
                     // 点击“取消”按钮时什么都不做
@@ -597,7 +599,9 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
         }
         return currentItem;
     }
-private String gift_bag="";
+
+    private String gift_bag = "";
+
     private void giveGift(String num) {
         getSelectedGift();
         int currentItem = mBinding.viewPager.getCurrentItem();
@@ -647,8 +651,8 @@ private String gift_bag="";
                 //礼物打赏
                 giftNumber = num;
 
-                if(roonGiftModel.getActivities_id()==4){
-                    gift_bag=roonGiftModel.getGift_bag()+"";
+                if (roonGiftModel.getActivities_id() == 4) {
+                    gift_bag = roonGiftModel.getGift_bag() + "";
                 }
 
                 if (userInfo != null) {
@@ -656,7 +660,7 @@ private String gift_bag="";
                         if (userInfo.getPit_number().equals("888") || userInfo.getPit_number().equals("")) {
                             if (userInfo.getPit_number().isEmpty() || jingp != 1) {
                                 roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
-                                MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "",gift_bag);
+                                MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "", gift_bag);
                             } else {
                                 roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, userInfo.getAuction_id());
                                 EventBus.getDefault().post(roomGiftGiveEvent);
@@ -666,17 +670,17 @@ private String gift_bag="";
                             }
                         } else {
                             roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
-                            MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, heart_id,gift_bag);
+                            MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, heart_id, gift_bag);
                         }
                     } else {
                         roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
-                        MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "",gift_bag);
+                        MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "", gift_bag);
                     }
                 } else {
                     if (all) {
-                        MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", null, "",gift_bag);
+                        MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", null, "", gift_bag);
                     } else {
-                            MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "",gift_bag);
+                        MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "", gift_bag);
                     }
                     roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
                 }
@@ -684,14 +688,14 @@ private String gift_bag="";
                 if (userInfo == null) {
                     giftNumber = num;
                     beibaoId = roonGiftModel.getGift_id();
-                    MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id,"");
+                    MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id, "");
                     return;
                 }
                 if (userInfo.getPit_number() != null && userInfo.getPit_number().equals("888") || userInfo.getPit_number().equals("")) {
                     if (userInfo.getPit_number().isEmpty() || jingp != 1) {
                         giftNumber = num;
                         beibaoId = roonGiftModel.getGift_id();
-                        MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id,"");
+                        MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id, "");
                     } else {
                         beibaoId = roonGiftModel.getGift_id();
                         MvpPre.roomAuctionJoin(userInfo.getAuction_id(), userInfo.getUser_id() + "", roonGiftModel.getGift_id(), num, "2");
@@ -703,7 +707,7 @@ private String gift_bag="";
                 } else {
                     giftNumber = num;
                     beibaoId = roonGiftModel.getGift_id();
-                    MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id,"");
+                    MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "2", pit, heart_id, "");
                 }
 
             } else {
diff --git a/app/build.gradle b/app/build.gradle
index fec825a6..f8e8c4bb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,15 +55,15 @@ android {
             // 正式版包名：使用基础包名（com.example.myapp）
             applicationIdSuffix ""
 //            // 测试版包名：基础包名 + .beta（com.example.myapp.beta）
-//            applicationIdSuffix ".beta.b"
+            applicationIdSuffix ".beta"
 
             // 【正式版应用名称】通过resValue动态生成string资源
-            resValue "string", "app_name", "羽声语音"
+            resValue "string", "app_name", "羽声内测"
 //            resValue "string", "app_name", "羽声语音APP"
 
             // 【正式版图标】替换manifest中的占位符（使用main目录下的正式图标）
             manifestPlaceholders = [
-                    appIcon: "@mipmap/ic_launcher"  // 需在main/res/mipmap放置该图标
+                    appIcon: "@mipmap/icon_nc"  // 需在main/res/mipmap放置该图标
             ]
         }
 
@@ -80,7 +80,7 @@ android {
 //
 //            // 【测试版图标】替换为测试专用图标
             manifestPlaceholders = [
-                    appIcon: "@mipmap/ic_launcher_app_bat"  // 需在main/res/mipmap放置该图标
+                    appIcon: "@mipmap/icon_nc"  // 需在main/res/mipmap放置该图标
             ]
         }
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 935c4123..17fb6a5d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -128,7 +128,7 @@
         android:enableOnBackInvokedCallback="true"
         android:extractNativeLibs="true"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher_app"
+        android:icon="${appIcon}"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:screenOrientation="portrait"
diff --git a/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java b/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
index d1c3c944..75697e13 100644
--- a/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
+++ b/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
@@ -310,12 +310,12 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
         }
         if (TextUtils.isEmpty(CommonAppContext.getInstance().getToken()) || TextUtils.isEmpty(CommonAppContext.getInstance().getUser().getTencent_im())) {
             Logger.e("SplashEnd", "ARouters.CODE_LOGIN");
-            if (canOnePass) {
-                phoneNumberAuthHelper.setAuthListener(tokenResultListener);
-                doOnePass();
-            } else {
-
-            }
+//            if (canOnePass) {
+//                phoneNumberAuthHelper.setAuthListener(tokenResultListener);
+//                doOnePass();
+//            } else {
+//
+//            }
         } else {
             Logger.e("SplashEnd", "ARouters.MAIN");