修改所有的不让修改用户信息给腾讯im

添加所有进入房间，进行同一个房间不在重复创建

app/release/output-metadata.json

@@ -11,9 +11,9 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 32,
+      "versionCode": 33,
-      "versionName": "1.0.4",
+      "versionName": "1.0.4.1",
-      "outputFile": "羽声_1.0.4_32.apk"
+      "outputFile": "羽声_1.0.4.1_33.apk"
     }
   ],
   "elementType": "File",
@@ -22,14 +22,14 @@
       "minApi": 28,
       "maxApi": 30,
       "baselineProfiles": [
-        "baselineProfiles/1/羽声_1.0.4_32.dm"
+        "baselineProfiles/1/羽声_1.0.4.1_33.dm"
       ]
     },
     {
       "minApi": 31,
       "maxApi": 2147483647,
       "baselineProfiles": [
-        "baselineProfiles/0/羽声_1.0.4_32.dm"
+        "baselineProfiles/0/羽声_1.0.4.1_33.dm"
       ]
     }
   ],

gradle.properties

@@ -30,8 +30,8 @@ isBuildModule=false
 #org.gradle.deamon=false
 android.injected.testOnly=false
 
-APP_VERSION_NAME=1.0.4
+APP_VERSION_NAME=1.0.4.1
-APP_VERSION_CODE=32
+APP_VERSION_CODE=33
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15

moduleUtil/src/main/java/com/qxcm/moduleutil/activity/WebViewActivity.java

@@ -79,7 +79,7 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
         mBinding.webView.addJavascriptInterface(new WebAppInterface(this), "Android");
 //        mBinding.webView.addJavascriptInterface(new WebViewBridgeConfig(title), WebViewBridgeConfig.NAME);
 
-        if (title!=null && !title.isEmpty()){
+        if (title != null && !title.isEmpty()) {
             if (title.contains("协议")) {
                 webSettings.setDisplayZoomControls(false); // 隐藏默认缩放控件
                 webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NORMAL); // 使用正常布局算法
@@ -91,10 +91,10 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
                 // 设置初始缩放
                 mBinding.webView.setInitialScale(100);
                 mBinding.webView.getSettings().setUseWideViewPort(false);
-            }else {
+            } else {
                 webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
             }
-        }else {
+        } else {
             webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
         }
 
@@ -111,7 +111,6 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
         mBinding.webView.setScrollContainer(true);
 
 
-
         mBinding.webView.setWebViewClient(new WebViewClient());
         mBinding.webView.setBackgroundColor(Color.TRANSPARENT);
         mBinding.webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
@@ -326,7 +325,7 @@ public class WebViewActivity extends BaseAppCompatActivity<ActivityWebViewBindin
 
         @JavascriptInterface
         public void jumpRoomPage(String room_id) {
-            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", room_id).navigation();
+            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", room_id).withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
         }
 
         @JavascriptInterface

moduleUtil/src/main/java/com/qxcm/moduleutil/activity/news/OfficialNoticeActivity.java

@@ -3,6 +3,7 @@ package com.qxcm.moduleutil.activity.news;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 
+import android.content.Intent;
 import android.text.Html;
 import android.view.View;
 
@@ -76,7 +77,7 @@ public class OfficialNoticeActivity extends BaseMvpActivity<NewsPresenter, Activ
                     @Override
                     public void onClick(View view) {
                         if (item.getRoom_id()>0){
-                            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("room_id", item.getRoom_id() + "").navigation();
+                            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("room_id", item.getRoom_id() + "").withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
                         }else if (item.getRoom_id() == 0 && item.getUrl() != null && !item.getUrl().isEmpty()){
                             ARouter.getInstance().build(ARouteConstants.H5).withString("url", item.getUrl()).navigation();
                         }

moduleUtil/src/main/java/com/qxcm/moduleutil/bean/room/EMMessageInfo.java

@@ -77,7 +77,7 @@ public class EMMessageInfo implements MultiItemEntity {
     public static final int QXRoomMessageTypeRoomDress = 1035;//动态修改用户头像信息
     public static final int QXRoomMessageTypeRoomOnline = 1036;//
     public static final int QXRoomMessageTypeRoomOPK = 1037;
-    public static final int QXRoomMessageTypeRoomOMh = 1038;
+    public static final int QXRoomMessageTypeRoomOMh = 1038;//盲盒礼物文字消息
     ///关闭对方麦克风
     public static final int QXRoomMessageTypeMuteRemoteAudio = 125;
     public static final int QXRoomMessageTypeMuteLocalAudio = 126;
@@ -132,9 +132,10 @@ public class EMMessageInfo implements MultiItemEntity {
                 case QXRoomMessageTypeRoomDress:
                 case QXRoomMessageTypeRoomOnline:
                 case QXRoomMessageTypeRoomOPK:
-                case QXRoomMessageTypeRoomOMh:
+
                     return 1;
                 case QXRoomMessageTypeGift:
+                case QXRoomMessageTypeRoomOMh:
                     return 3;
                 case 1:
                     return 2;

moduleUtil/src/main/java/com/qxcm/moduleutil/dialog/WebViewDialog.java

@@ -128,7 +128,7 @@ public class WebViewDialog extends BaseDialog<WebViewDialogBinding> {
 
         @JavascriptInterface
         public void jumpRoomPage(String room_id) {
-            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", room_id).navigation();
+            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", room_id)    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
         }
         @JavascriptInterface
         public void jumpWebPage(String objects) {

moduleUtil/src/main/java/com/qxcm/moduleutil/widget/AvatarFrameView.java

@@ -207,11 +207,11 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
             return;
         }
         // 再次检查内存状态
-        if (isMemoryLow()) {
+//        if (isMemoryLow()) {
-            LogUtils.w(TAG, "Low memory, clearing queue");
+//            LogUtils.w(TAG, "Low memory, clearing queue");
-            clearQueue();
+//            clearQueue();
-            return;
+//            return;
-        }
+//        }
         // 检查特效是否开启
         if (SpUtil.getOpenEffect() != 1) {
             clearQueue();
@@ -263,12 +263,12 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
             mainHandler.post(() -> setSource(url, type2));
             return;
         }
-        // 检查内存状态
+//        // 检查内存状态
-        if (isMemoryLow()) {
+//        if (isMemoryLow()) {
-            LogUtils.w(TAG, "Low memory, skipping animation");
+//            LogUtils.w(TAG, "Low memory, skipping animation");
-            clearQueue();
+//            clearQueue();
-            return;
+//            return;
-        }
+//        }
         // 检查特效是否开启
         if (SpUtil.getOpenEffect() != 1) {
             // 特效关闭时清空队列并停止播放

moduleUtil/src/main/java/com/qxcm/moduleutil/widget/BaseWheatView.java

@@ -34,8 +34,6 @@ import com.qxcm.moduleutil.event.RoomFaceEvent;
 import com.qxcm.moduleutil.interfaces.IBaseWheat;
 import com.qxcm.moduleutil.interfaces.SoundLevelUpdateListener;
 import com.qxcm.moduleutil.rtc.AgoraManager;
-import com.qxcm.moduleutil.rtc.RtcCore;
-import com.qxcm.moduleutil.rtc.RtcManager;
 import com.qxcm.moduleutil.utils.SpUtil;
 import com.qxcm.moduleutil.utils.logger.Logger;
 import com.tencent.liteav.base.Log;
@@ -166,6 +164,7 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
 
         setCardiac(pitBean.getCharm(), getTzbl());
         setPitData(bean);
+
 //        if (bean.getIs_online() == 0 &&bean.getUser_id() != null && !bean.getUser_id().equals("0") && !bean.getUser_id().isEmpty()) {
 //            iv_on_line.setVisibility(VISIBLE);
 //        } else {
@@ -246,6 +245,7 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
                         mIvRipple.setVisibility(VISIBLE);
                         mIvRipple.post(() -> {
                             mIvRipple.startAnimation();
+                            iv_on_line.setVisibility(GONE);
 //                            mIvRipple.setSource(getResources().getResourceName(R.raw.ripple3695), 2);
 
                         });
@@ -274,6 +274,7 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
                     mIvRipple.setVisibility(VISIBLE);
                     mIvRipple.post(() -> {
                         mIvRipple.startAnimation();
+                        iv_on_line.setVisibility(GONE);
 //                            mIvRipple.setSource(getResources().getResourceName(R.raw.ripple3695), 2);
 
                     });

modulecircle/src/main/java/com/example/modulecircle/activity/DynamicDetailActivity.java

@@ -3,6 +3,7 @@ package com.example.modulecircle.activity;
 import android.app.AlertDialog;
 import android.content.ClipData;
 import android.content.ClipboardManager;
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -150,7 +151,7 @@ public class DynamicDetailActivity extends BaseMvpActivity<CirclePresenter, Acti
             @Override
             public void onGensui(CircleListBean item) {
                 if (item.getRoom_id()!=null &&  !item.getRoom_id().equals("0")) {
-                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()).navigation();
+                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id())    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
                 }else {
                     ChatLauncher.getInstance().launchC2CChat(DynamicDetailActivity.this, item.getUser_id()+"");
                 }

modulecircle/src/main/java/com/example/modulecircle/activity/DynamicListActivity.java

@@ -125,7 +125,7 @@ public class DynamicListActivity extends BaseMvpActivity<CirclePresenter, Activi
             @Override
             public void onGensui(CircleListBean item) {
                 if (item.getRoom_id()!=null &&  !item.getRoom_id().equals("0")) {
-                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()).navigation();
+                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id())    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
                 }else {
                     ChatLauncher.getInstance().launchC2CChat(DynamicListActivity.this, item.getUser_id()+"");
                 }

modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java

@@ -172,7 +172,7 @@ public class CircleCategoryFragment extends BaseMvpFragment<CirclePresenter, Fra
             @Override
             public void onGensui(CircleListBean item) {
                 if (item.getRoom_id()!=null &&  !item.getRoom_id().equals("0")) {
-                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()).navigation();
+                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id())    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
                 }else {
                     ChatLauncher.getInstance().launchC2CChat(getActivity(), item.getUser_id()+"");
                 }

modulecircle/src/main/java/com/example/modulecircle/fragment/ExpandColumnFragment.java

@@ -1,5 +1,6 @@
 package com.example.modulecircle.fragment;
 
+import android.content.Intent;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
@@ -133,7 +134,7 @@ public class ExpandColumnFragment extends BaseMvpFragment<CirclePresenter, Fragm
             @Override
             public void onGnsClick(ExpandColumnBean item) {
                 if ( item.getRoom_id()!=0){
-                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()+"").navigation();
+                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()+"")    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
                 }else {
                     ChatLauncher.getInstance().launchC2CChat(getActivity(), item.getUser_id()+"");
                 }

modulemain/src/main/java/com/qxcm/modulemain/activity/MainActivity.java

@@ -110,6 +110,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
 //        ServiceUtils.startService(EMqttService.class);
         checkTab(getIntent().getIntExtra("tab", -1));
     }
+
     @Override
     protected void initData() {
         MvpPre.getThemeData();
@@ -157,6 +158,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
             selectShow(tab);
         }
     }
+
     private boolean isExit = false; // 标记是否准备退出
     private Handler mHandler = new Handler();
 
@@ -281,7 +283,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
         } else if (id == R.id.riv) {
             String roomId = CommonAppContext.getInstance().playId;
             if (!TextUtils.isEmpty(roomId)) {
-                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", roomId).navigation();
+                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", roomId).withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
             }
         } else if (id == R.id.iv_shouchl) {
             FirstChargeDialog firstChargeDialog = new FirstChargeDialog(this);
@@ -387,7 +389,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
                     .load(imageUrl)
                     .placeholder(com.qxcm.moduleutil.R.mipmap.tab_main_media_unselected) // 默认图标
                     .into(mBinding.imSy);
-        }else {
+        } else {
             // 如果没有网络图标，使用默认的选中/未选中状态
             int resId = (index == 0) ?
                     com.qxcm.moduleutil.R.mipmap.tab_main_media_selected :
@@ -396,6 +398,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
         }
 
     }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -414,7 +417,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
             mBinding.ll.setVisibility(View.INVISIBLE);
         }
         if (CommonAppContext.getInstance().isPlaying && CommonAppContext.getInstance().isShow) {
-            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", CommonAppContext.getInstance().playId).navigation();
+            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", CommonAppContext.getInstance().playId).withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
         }
 
         V2TIMManager.getConversationManager().getTotalUnreadMessageCount(new V2TIMValueCallback<Long>() {
@@ -541,9 +544,9 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
 
     @Override
     public void getThemeData(ThemeBean themeBean) {
-        if (themeBean != null){
+        if (themeBean != null) {
-            selectedMediaUrl=themeBean.getHome_sel();
+            selectedMediaUrl = themeBean.getHome_sel();
-            unselectedMediaUrl=themeBean.getHome_nor();
+            unselectedMediaUrl = themeBean.getHome_nor();
 
             // 语圈 tab 图标
             selectedTrendUrl = themeBean.getFind_sel();
@@ -561,11 +564,11 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
                 if (themeBean.getBtn_text_color() != null && !themeBean.getBtn_text_color().isEmpty()) {
                     selectedTextColor = Color.parseColor(themeBean.getBtn_text_color());
                 }
-                    unselectedTextColor = Color.parseColor("#BFBFBF");
+                unselectedTextColor = Color.parseColor("#BFBFBF");
             } catch (Exception e) {
                 // 使用默认颜色
                 selectedTextColor = Color.parseColor("#323232");
-                unselectedTextColor =Color.parseColor("#BFBFBF");
+                unselectedTextColor = Color.parseColor("#BFBFBF");
             }
             Map<String, String> colorMap = new HashMap<>();
             colorMap.put("theme_color", themeBean.getTheme_color());
@@ -573,7 +576,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
             updateThemeColors(colorMap);
             // 更新 UI
             updateAllTabUI();
-            if (themeBean.getApp_bg()!=null) {
+            if (themeBean.getApp_bg() != null) {
                 BackgroundManager.getInstance().setBackgroundUrl(themeBean.getApp_bg());
                 loadNetworkBackground();
             }
@@ -672,7 +675,6 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
     }
 
 
-
 //    @Override
 //    protected void onPause() {
 //        super.onPause();

moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java

@@ -100,11 +100,11 @@ import com.qxcm.moduleutil.dialog.ConfirmDialog;
 import com.qxcm.moduleutil.event.RoomJoinMountModel;
 import com.qxcm.moduleutil.rtc.AgoraManager;
 import com.qxcm.moduleutil.rtc.MusicPlayBean;
-import com.qxcm.moduleutil.rtc.RtcCore;
 import com.qxcm.moduleutil.service.MyRoomSingleton;
 import com.qxcm.moduleutil.utils.ARouteConstants;
 import com.qxcm.moduleutil.utils.DialogUtils;
 import com.qxcm.moduleutil.utils.ImageUtils;
+import com.qxcm.moduleutil.utils.MemoryOptimizationUtils;
 import com.qxcm.moduleutil.utils.SpUtil;
 import com.qxcm.moduleutil.widget.AvatarFrameView;
 import com.qxcm.moduleutil.widget.CircularProgressView;
@@ -911,7 +911,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
 
                 @Override
                 public void onClick(View v) {
-                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", mRoomInfoResp.getRoom_info().getHead_line().getRoom_id()).navigation();
+                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", mRoomInfoResp.getRoom_info().getHead_line().getRoom_id()).withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
                 }
             });
 
@@ -1369,20 +1369,26 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
         if (EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().unregister(this);
         }
+
+        // 2. 销毁 AgoraManager（RTC 引擎）
+        try {
+            AgoraManager.getInstance(this).destroy();
+        } catch (Exception e) {
+            LogUtils.e("AgoraManager destroy error: " + e.getMessage());
+        }
+
+
         destroyAllFragments();
         // 清理消息监听器
         MessageListenerSingleton.reset(roomId);
         // 释放所有 AvatarFrameView 实例
-        releaseAllAvatarFrameViews();
+//        releaseAllAvatarFrameViews();
-        // 释放 Agora 资源
+//        MemoryOptimizationUtils.forceGC();/**/
-        AgoraManager.getInstance(this).destroy();
-
         // 销毁自定义音乐悬浮窗
         if (customMusicFloatingView != null) {
             customMusicFloatingView.destroy();
             customMusicFloatingView = null;
         }
-
         // 释放悬浮窗控制资源
         if (musicWindowControl != null) {
             musicWindowControl.cancel();
@@ -1433,7 +1439,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
             mBinding.roomTop.userRecyclerView.setAdapter(null);
             // 清理其他可能的视图引用
             // 释放布局中的 AvatarFrameView 实例
-            releaseLayoutAvatarFrameViews();
+//            releaseLayoutAvatarFrameViews();
             mBinding = null;
         }
 

moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java

@@ -54,6 +54,7 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -385,22 +386,27 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
 
     private int getSelectedGift() {
         int currentItem = mBinding.viewPager.getCurrentItem();
+
+        // 增加边界检查
+        if (fragmentList == null || currentItem < 0 || currentItem >= fragmentList.size()) {
+            return currentItem;
+        }
+
         if (currentItem < 1) {  //比1小的是背包
             GiftTwoDetailsFragment fragment = (GiftTwoDetailsFragment) fragmentList.get(currentItem);
-//            roonGiftModel = fragment.getGiftList();
+            if (fragment != null && giftModel == null) {
-            if (giftModel == null) {
                 giftModel = fragment.mGiftList();
             }
         } else {
             GiftTwoDetailsFragment fragment = (GiftTwoDetailsFragment) fragmentList.get(currentItem);
-//            giftModel = fragment.mGiftList();
+            if (fragment != null && roonGiftModel == null) {
-            if (roonGiftModel == null) {
                 roonGiftModel = fragment.getGiftList();
             }
         }
         return currentItem;
     }
 
+
     private void giveGift(String num) {
         getSelectedGift();
         int currentItem = mBinding.viewPager.getCurrentItem();
@@ -565,25 +571,41 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
         public MyFragmentPagerAdapter(FragmentManager fm, List<GiftLabelBean> list, List<Fragment> fragmentList) {
             super(fm);
             this.list = list;
-            this.fragmentList = fragmentList;
+//            this.fragmentList = fragmentList;
+            // 确保 fragmentList 初始化为正确大小，所有位置初始为 null
+            this.fragmentList = new ArrayList<>();
+            for (int i = 0; i < list.size(); i++) {
+                this.fragmentList.add(null);
+            }
         }
 
         @Override
         public Fragment getItem(int position) {
-            GiftLabelBean model = list.get(position);
+            // 确保 position 在有效范围内
-            Fragment fragment = GiftTwoDetailsFragment.newInstance(model.getId(), 1);
+            if (position < 0 || position >= list.size()) {
-            fragmentList.add(fragment); // 保存 Fragment 实例
+                return null;
-            return fragment;
+            }
+            // 检查该位置是否已经有 Fragment 实例
+            if (fragmentList.get(position) == null) {
+                GiftLabelBean model = list.get(position);
+                Fragment fragment = GiftTwoDetailsFragment.newInstance(model.getId(), 1);
+                // 在指定位置设置 Fragment 实例
+                fragmentList.set(position, fragment);
+            }
+            return fragmentList.get(position);
         }
 
         @Override
         public int getCount() {
-            return list.size();
+            return list != null ? list.size() : 0;
         }
 
         @Nullable
         @Override
         public CharSequence getPageTitle(int position) {
+            if (list == null || position < 0 || position >= list.size()) {
+                return null;
+            }
             GiftLabelBean model = list.get(position);
             return model.getName();
         }

moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java

@@ -25,6 +25,7 @@ import com.example.moduleroom.databinding.DialogRoomSettingFragmentBinding;
 import com.example.moduleroom.fragment.RoomBackgroundDialogFragment;
 import com.hjq.toast.ToastUtils;
 import com.qxcm.moduleutil.base.CommonAppContext;
+import com.qxcm.moduleutil.dialog.ConfirmDialog;
 import com.qxcm.moduleutil.event.EffectEvent;
 import com.qxcm.moduleutil.event.MusicEvent;
 import com.qxcm.moduleutil.event.RoomOutEvent;
@@ -247,13 +248,17 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
                 } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomLeave) {
                     EventBus.getDefault().post(new RoomOutEvent());
                 } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeSing) {
-                    MvpPre.changeRoomType(roomId, "1");
+                    queren("1");
+//                    MvpPre.changeRoomType(roomId, "1");
                 } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeAuction) {
-                    MvpPre.changeRoomType(roomId, "2");
+                    queren("2");
+//                    MvpPre.changeRoomType(roomId, "2");
                 } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeBoy) {
-                    MvpPre.changeRoomType(roomId, "3");
+                    queren("3");
+//                    MvpPre.changeRoomType(roomId, "3");
                 } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeGirl) {
-                    MvpPre.changeRoomType(roomId, "4");
+                    queren("4");
+//                    MvpPre.changeRoomType(roomId, "4");
                 } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomSetting) {
                     ARouter.getInstance().build(ARouteConstants.CREATED_ROOM).withSerializable("roomInfoResp", roomInfoResp).navigation();
                 }else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomReport){
@@ -263,6 +268,21 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
             }
         });
     }
+    private void queren(String type) {
+        // 创建并显示确认对话框
+        new ConfirmDialog(getActivity(),
+                "提示",
+                "即将修改房间类型为"+ (type.equals("1")?"点唱" : (type.equals("2")?"拍卖" : (type.equals("3")?"男神" : (type.equals("4")?"女神" : "")))),
+                "确认",
+                "取消",
+                v -> {
+                    // 点击“确认”按钮时执行删除操作
+                    MvpPre.changeRoomType(roomId, type);
+                },
+                v -> {
+                    // 点击“取消”按钮时什么都不做
+                }, false, 0).show();
+    }
 
     private void upAdapter() {
         adapter.notifyDataSetChanged();

moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java

@@ -9,22 +9,12 @@ import com.qxcm.moduleutil.base.CommonAppContext;
 import com.qxcm.moduleutil.bean.RoomCharmRankBean;
 import com.qxcm.moduleutil.bean.RoomResultResp;
 import com.qxcm.moduleutil.bean.UserOnlineStatusBean;
-import com.qxcm.moduleutil.bean.room.Config;
-import com.qxcm.moduleutil.bean.room.RoomBean;
 import com.qxcm.moduleutil.bean.room.RoomInfoResp;
 import com.qxcm.moduleutil.bean.room.RoomOnline;
-import com.qxcm.moduleutil.bean.room.RoomOnlineBean;
-import com.qxcm.moduleutil.bean.room.RoomPitBean;
-import com.qxcm.moduleutil.bean.room.RoomUserBean;
 import com.qxcm.moduleutil.http.APIException;
 import com.qxcm.moduleutil.http.BaseObserver;
 import com.qxcm.moduleutil.presenter.BasePresenter;
 import com.qxcm.moduleutil.rtc.AgoraManager;
-import com.qxcm.moduleutil.rtc.RtcConstants;
-import com.qxcm.moduleutil.rtc.RtcCore;
-import com.qxcm.moduleutil.rtc.RtcDestroyCallback;
-import com.qxcm.moduleutil.rtc.RtcManager;
-import com.qxcm.moduleutil.utils.GsonUtils;
 import com.qxcm.moduleutil.utils.SpUtil;
 
 import java.lang.ref.WeakReference;

modulevocal/src/main/java/com/example/modulevocal/activity/DailyTasksActivity.java

@@ -140,17 +140,17 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
             @Override
             public void onItemClick(TaskItem taskItem, GiftBoxBean.TaskDataBean.DailyTasksBean item) {
                 if (taskItem.getTitle().equals("今日任务") || taskItem.getTitle().equals("平台任务")) {
-                    if (item.getTask_status()==2) {
+                    if (item.getTask_status() == 2) {
                         MvpPre.dailyTasksReceive(item.getTask_id() + "");
                     }
                 } else {
-                    if (item.getTask_status() == 2){
+                    if (item.getTask_status() == 2) {
                         MvpPre.dailyTasksReceive(item.getTask_id() + "");
-                    }else if (item.getTask_status() == 1) {
+                    } else if (item.getTask_status() == 1) {
                         if (item.getTask_id() == 9) {
-                            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("roomId", item.getFrom_id()).withString("taskId", item.getTask_id() + "").navigation();
+                            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("roomId", item.getFrom_id()).withString("taskId", item.getTask_id() + "").withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
                         } else {
-                            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("roomId", item.getFrom_id()).withString("taskId", item.getTask_id() + "").navigation();
+                            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("roomId", item.getFrom_id()).withString("taskId", item.getTask_id() + "").withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
                         }
                     }
                 }

modulevocal/src/main/java/com/example/modulevocal/activity/MyRoomActivity.java

@@ -211,7 +211,7 @@ public class MyRoomActivity extends BaseMvpActivity<MyRoomPresenter, RoomActivit
             mBinding.ll.setVisibility(View.INVISIBLE);
         }
         if (CommonAppContext.getInstance().isPlaying && CommonAppContext.getInstance().isShow) {
-            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", CommonAppContext.getInstance().playId).navigation();
+            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", CommonAppContext.getInstance().playId)    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
         }
     }
 

modulevocal/src/main/java/com/example/modulevocal/activity/PersonalityActivity.java

@@ -27,6 +27,7 @@ import com.qxcm.moduleutil.activity.BaseAppCompatActivity;
 import com.qxcm.moduleutil.activity.BaseMvpActivity;
 import com.qxcm.moduleutil.activity.WebViewActivity;
 import com.qxcm.moduleutil.adapter.MyPagerAdapter;
+import com.qxcm.moduleutil.base.CommonAppContext;
 import com.qxcm.moduleutil.bean.MyBagBean;
 import com.qxcm.moduleutil.bean.PersonaltyBean;
 import com.qxcm.moduleutil.utils.SpUtil;
@@ -128,7 +129,8 @@ public class PersonalityActivity extends BaseMvpActivity<PersonalityPresenter, A
         mBinding.topBar.setRightColor(Color.parseColor("#FF8ACC"));
         mBinding.topBar.getTvRight().setOnClickListener(v -> {
             Intent intent=new Intent(this, WebViewActivity.class);
-            intent.putExtra("url", "https://vespa.qxmier.com/web/index.html#/pages/prop/propMall?id="+SpUtil.getToken());
+            intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/prop/propMall?id="+SpUtil.getToken());
+//            intent.putExtra("url", "https://vespa.qxmier.com/web/index.html#/pages/prop/propMall?id="+SpUtil.getToken());
             intent.putExtra("title", "道具商城");
             startActivity(intent);
         });

modulevocal/src/main/java/com/example/modulevocal/adapter/MyCreateAdapter.java

@@ -314,7 +314,7 @@ public class MyCreateAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 @Override
                 public void onClick(View v) {
                     // TODO: 跳转到房间
-                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", item.getRoom_id() + "").navigation();
+                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", item.getRoom_id() + "")    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
                 }
             });
             tv_room_bt.setOnClickListener(new View.OnClickListener() {
@@ -378,7 +378,7 @@ public class MyCreateAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 @Override
                 public void onClick(View v) {
                     // TODO: 跳转到房间
-                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", item.getRoom_id() + "").navigation();
+                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", item.getRoom_id() + "")    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
                 }
             });
         }
@@ -437,7 +437,7 @@ public class MyCreateAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             rl_root.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", item.getRoom_id() + "").navigation();
+                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", item.getRoom_id() + "")    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
 
                 }
             });

modulevocal/src/main/java/com/example/modulevocal/fragment/CirleListFragment.java

@@ -134,7 +134,7 @@ public class CirleListFragment extends BaseMvpFragment<UserHomepagePresenter, Fr
 
             @Override
             public void onGensui(CircleListBean item) {
-                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form","首页热门列表").withString("roomId", item.getRoom_id()).navigation();
+                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form","首页热门列表").withString("roomId", item.getRoom_id())    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
 
             }
         });

modulevocal/src/main/java/com/example/modulevocal/fragment/MyFollowFragment.java

@@ -1,6 +1,7 @@
 package com.example.modulevocal.fragment;
 
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 
@@ -77,7 +78,7 @@ public class MyFollowFragment extends BaseMvpFragment<MyRoomPresenter, RoomFragm
                 MyRoomBean item = followAdapter.getItem(position);
                 if (item != null) {
 //                    ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("form", "历史记录列表").withString("roomId", item.getRoom_id()).navigation();
-                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", item.getRoom_id() + "").navigation();
+                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", item.getRoom_id() + "")    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
 
                 }
             }

modulevocal/src/main/java/com/example/modulevocal/fragment/MyManageFragment.java

@@ -1,5 +1,6 @@
 package com.example.modulevocal.fragment;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 
@@ -79,7 +80,7 @@ public class MyManageFragment extends BaseMvpFragment<MyRoomPresenter, RoomFragm
                 MyRoomBean item = manageAdapter.getItem(position);
                 if (item != null) {
 //                    ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("form", "历史记录列表").withString("roomId", item.getRoom_id()).navigation();
-                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", item.getRoom_id() + "").navigation();
+                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", item.getRoom_id() + "")    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
 
                 }
             }

modulevocal/src/main/java/com/example/modulevocal/fragment/UserHomepageFragment.java

@@ -204,7 +204,7 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
                 intent.putExtra(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_C2C);
                 startActivity(intent);
             } else {
-                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("roomId", userInfo.getRoom_id()).navigation();
+                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("roomId", userInfo.getRoom_id())    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
             }
         }
     }

modulevocal/src/main/java/com/example/modulevocal/fragment/VocalRangeFragment.java

@@ -34,6 +34,7 @@ import com.example.modulevocal.databinding.FragmentVocalRangeBinding;
 import com.example.modulevocal.presenter.MePresenter;
 import com.qxcm.moduleutil.activity.WebViewActivity;
 import com.qxcm.moduleutil.base.BaseMvpFragment;
+import com.qxcm.moduleutil.base.CommonAppContext;
 import com.qxcm.moduleutil.bean.UserBean;
 import com.qxcm.moduleutil.bean.UserInfo;
 import com.qxcm.moduleutil.utils.ImageUtils;
@@ -134,12 +135,14 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
             startActivity(intent);
         }else if (id==R.id.me_my_guild){
             Intent intent=new Intent(getContext(), WebViewActivity.class);
-            intent.putExtra("url", " https://vespa.qxmier.com/web/index.html#/pages/union/index?id="+SpUtil.getToken());
+            intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/union/index?id="+SpUtil.getToken());
+//            intent.putExtra("url", " https://vespa.qxmier.com/web/index.html#/pages/union/index?id="+SpUtil.getToken());
             intent.putExtra("title", "公会");
             startActivity(intent);
         }else if (id==R.id.tv_my_shopping){
             Intent intent=new Intent(getContext(), WebViewActivity.class);
-            intent.putExtra("url", "https://vespa.qxmier.com/web/index.html#/pages/prop/propMall?id="+SpUtil.getToken());
+            intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/prop/propMall?id="+SpUtil.getToken());
+//            intent.putExtra("url", "https://vespa.qxmier.com/web/index.html#/pages/prop/propMall?id="+SpUtil.getToken());
             intent.putExtra("title", "道具商城");
             startActivity(intent);
         }

modulevoice/src/main/java/com/example/modulevoice/activity/SearchActivity.java

@@ -1,5 +1,6 @@
 package com.example.modulevoice.activity;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -156,7 +157,7 @@ public class SearchActivity extends BaseMvpActivity<SearchPresenter, ActivitySea
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 RoomSearchResp item = mSearchRoomResultAdapter.getItem(position);
                 if (item != null) {
-                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "搜索界面").withString("roomId", item.getId()).navigation();
+                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "搜索界面").withString("roomId", item.getId())    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
                 }
             }
         });

modulevoice/src/main/java/com/example/modulevoice/adapter/HotAdapter.java

@@ -2,6 +2,7 @@ package com.example.modulevoice.adapter;
 
 import static android.view.View.GONE;
 
+import android.content.Intent;
 import android.view.View;
 import android.widget.ImageView;
 
@@ -59,7 +60,7 @@ public class HotAdapter extends BaseMultiItemQuickAdapter<TopRoom, BaseViewHolde
             @Override
             public void onClick(View v) {
 //                ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("form","首页热门列表").withString("roomId", item.getId()).navigation();
-                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()).navigation();
+                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id())    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
 
             }
         });

modulevoice/src/main/java/com/example/modulevoice/adapter/SearchRoomResultAdapter.java

@@ -2,6 +2,7 @@ package com.example.modulevoice.adapter;
 
 import static android.view.View.GONE;
 
+import android.content.Intent;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
@@ -43,7 +44,7 @@ public class SearchRoomResultAdapter extends BaseQuickAdapter<RoomSearchResp, Ba
             @Override
             public void onClick(View v) {
 //                ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("form","首页热门列表").withString("roomId", item.getId()).navigation();
-                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getId()).navigation();
+                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getId())    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
 
             }
         });

modulevoice/src/main/java/com/example/modulevoice/fragment/HotListFragment.java

@@ -1,5 +1,6 @@
 package com.example.modulevoice.fragment;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.speech.tts.Voice;
 import android.view.View;
@@ -116,7 +117,7 @@ public class HotListFragment extends BaseMvpFragment<HotListPresenter, FragmentH
                 TopRoom item = mAdapter.getItem(position);
                 if (item != null) {
 //                    ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("form","首页热门列表").withString("roomId", item.getId()).navigation();
-                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()).navigation();
+                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id())    .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP).navigation();
                 }
             }
         });

modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceCategoryFragment.java

@@ -2,6 +2,7 @@ package com.example.modulevoice.fragment;
 
 import static android.view.View.GONE;
 
+import android.content.Intent;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
@@ -167,6 +168,7 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
                 ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS)
                         .withString("form", "首页热门列表")
                         .withString("roomId", data.getRoom_id())
+                        .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP)
                         .navigation();
             }
         });
@@ -200,6 +202,7 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
                                 .build(ARouteConstants.ROOM_DETAILS)
                                 .withString("form", "首页热门列表")
                                 .withString("roomId", roomId)
+                                .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP)
                                 .navigation();
                     } else {
                         // Log.d(TAG, "Room ID is null or empty for item at position: " + position);