From 9d546717dbcf81e864c7dad0fb527b15d6a49ea0 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Wed, 10 Dec 2025 18:06:10 +0800
Subject: [PATCH] =?UTF-8?q?83=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/room/fragment/FriendshipRoomFragment.java      | 6 +++---
 .../modulemain/activity/room/fragment/SingSongFragment.java | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
index 4ee0ffab..12679172 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
@@ -359,9 +359,9 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
         if (checkWeather(pitBean.getPit_number())) {
             showPopupMenu(wheatView); // v 是点击的按钮视图
         } else if (pitBean.getPit_number().equals("10")) {
-            if (ActivityUtils.getTopActivity() instanceof RoomActivity) {
-                if (((RoomActivity) ActivityUtils.getTopActivity()).getHostUser() < 4) {
-                    if (((RoomActivity) ActivityUtils.getTopActivity()).isFastDoubleClick(roomInfoResp.getUser_info().getUser_id() + "", pitBean.getPit_number())) {
+            if (getActivity() != null && getActivity() instanceof RoomActivity) {
+                if (((RoomActivity) getActivity()).getHostUser() < 4) {
+                    if (((RoomActivity) getActivity()).isFastDoubleClick(roomInfoResp.getUser_info().getUser_id() + "", pitBean.getPit_number())) {
                         return;
                     }
                     RoomOnlineDialogFragment.show(roomId, "10", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
index e2375a75..8f40264c 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
@@ -183,8 +183,8 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
                         roomPitBean = pitBean;
                         showPopupMenu(view); // v 是点击的按钮视图
                     } else if (pitNumber1 == 10) {
-                        if (ActivityUtils.getTopActivity() instanceof RoomActivity){
-                            if (((RoomActivity) ActivityUtils.getTopActivity()).getHostUser() < 4){
+                        if (getActivity() != null && getActivity() instanceof RoomActivity){
+                            if (((RoomActivity) getActivity()).getHostUser() < 4){
                                 if (!isFastDoubleClick("online_dialog", pitNumber1 + "")) {
                                     RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
                                 }
@@ -715,7 +715,6 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
                         if (!isFastDoubleClick("online_dialog", pitNumber1 + "")) {
                             RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
                         }
-//                        RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
                     } else {
                         MvpPre.applyPit(roomId, pitNumber1 + "");
                     }
@@ -785,7 +784,6 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
                         if (!isFastDoubleClick("online_dialog", pitNumber1 + "")) {
                             RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
                         }
-//                        RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
                     } else {
                         MvpPre.applyPit(roomId, pitNumber1 + "");
                     }