fix bugs 55 4

2025-11-27 15:45:10 +08:00
parent 5ed3717acc
commit bcf6dd6849
3 changed files with 41 additions and 23 deletions
--- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
@@ -161,7 +161,7 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
        //设置mqtt环境 false 测试环境 true 正式环境
 //        ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false);
        //设置http环境 false 测试环境 true 正式环境
-        ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(true);
+        ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(false);
        currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH();


--- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/CrashHandler.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/CrashHandler.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.util.Log;

 import com.alibaba.android.arouter.launcher.ARouter;
+import com.blankj.utilcode.util.ActivityUtils;
 import com.xscm.moduleutil.base.CommonAppContext;

 public class CrashHandler implements Thread.UncaughtExceptionHandler {
@@ -38,6 +39,7 @@ public class CrashHandler implements Thread.UncaughtExceptionHandler {
    private void restartApp() {
        // 实现应用重启逻辑
        ARouter.getInstance().build(ARouteConstants.ME).navigation();
+        ActivityUtils.finishAllActivities();
        CommonAppContext.getInstance().initialization();
    }
 }
--- 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
@@ -81,8 +81,18 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
    @Override
    public void applyPit() {

+    }
+    public FriendshipRoomFragment() {
    }

+    public FriendshipRoomFragment(RoomInfoResp roomInfoResp) {
+        this.roomInfoResp = roomInfoResp;
+    }
+
+    public static FriendshipRoomFragment newInstance(RoomInfoResp roomInfoResp) {
+        FriendshipRoomFragment fragment = new FriendshipRoomFragment(roomInfoResp);
+        return fragment;
+    }
    @Override
    public void endFriend(FriendUserBean friendUserBean) {
        if (friendUserBean != null) {
@@ -152,17 +162,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
    }


-    public  FriendshipRoomFragment(){}
-    public  FriendshipRoomFragment(RoomInfoResp roomInfoResp){
-        this.roomInfoResp = roomInfoResp;
-    }
-    // TODO: Rename and change types and number of parameters
-    public static FriendshipRoomFragment newInstance(RoomInfoResp roomInfoResp) {
-        FriendshipRoomFragment fragment = new FriendshipRoomFragment(roomInfoResp);
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        return fragment;
-    }
+


    @Override
@@ -239,6 +239,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
        initPopupWindow();

        roomId = roomInfoResp.getRoom_info().getRoom_id();
+        
        for (int i = 0; i < roomInfoResp.getRoom_info().getPit_list().size(); i++) {
            RoomPitBean roomPitBean = roomInfoResp.getRoom_info().getPit_list().get(i);
            if (i == 6 || i == 7) {
@@ -358,13 +359,13 @@ 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 (ActivityUtils.getTopActivity() instanceof RoomActivity) {
+                if (((RoomActivity) ActivityUtils.getTopActivity()).getHostUser() < 4) {
+                    if (((RoomActivity) ActivityUtils.getTopActivity()).isFastDoubleClick(roomInfoResp.getUser_info().getUser_id() + "", pitBean.getPit_number())) {
                        return;
                    }
                    RoomOnlineDialogFragment.show(roomId, "10", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
-                }else {
+                } else {
                    com.hjq.toast.ToastUtils.show("请等待主持抱麦");
                }
            }
@@ -447,6 +448,11 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
        if (fromUserInfo == null) return;

        String pitNumber = messageEvent.getText().getPit_number();
+
+        if (Integer.parseInt(pitNumber) == 7 || Integer.parseInt(pitNumber) == 8 || Integer.parseInt(pitNumber) > 10) {
+            return;
+        }
+
        int userId = fromUserInfo.getUser_id();
        RoomPitBean pitBean = mWheatViews.get(Integer.parseInt(pitNumber) - 1).pitBean;
        pitBean.setUser_id(userId + "");
@@ -457,9 +463,9 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
        pitBean.setDress(fromUserInfo.getDress());

        mWheatViews.get(Integer.parseInt(pitNumber) - 1).setData(pitBean);
-        if (userId == SpUtil.getUserId() ) {
-            myPitNumber=Integer.parseInt(pitNumber);
-            if (pitNumber.equals("9")){
+        if (userId == SpUtil.getUserId()) {
+            myPitNumber = Integer.parseInt(pitNumber);
+            if (pitNumber.equals("9")) {
                configGameOptionBtn();
            }
        }
@@ -469,6 +475,9 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese

    public void event1004(RoomMessageEvent messageEvent) {
        String pitNumber = messageEvent.getText().getPit_number();
+        if (Integer.parseInt(pitNumber) == 7 || Integer.parseInt(pitNumber) == 8 || Integer.parseInt(pitNumber) > 10) {
+            return;
+        }
        RoomPitBean pitBean = mWheatViews.get(Integer.parseInt(pitNumber) - 1).pitBean;
        pitBean.setUser_id("");
        pitBean.setAvatar("");
@@ -477,10 +486,10 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
        pitBean.setCharm("");
        pitBean.setDress("");
        mWheatViews.get(Integer.parseInt(pitNumber) - 1).setData(pitBean);
-        if (messageEvent.getText().getFromUserInfo()==null){
+        if (messageEvent.getText().getFromUserInfo() == null) {
            return;
        }
-        if (SpUtil.getUserId()==messageEvent.getText().getFromUserInfo().getUser_id()){
+        if (SpUtil.getUserId() == messageEvent.getText().getFromUserInfo().getUser_id()) {
            myPitNumber = -1;
            if (pitNumber.equals("9")) {
                configGameOptionBtn();
@@ -495,7 +504,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
            if (i == 6 || i == 7)
                continue;
            RoomPitBean roomPitBean = roomInfoResp.getRoom_info().getPit_list().get(i);
-            if (Integer.parseInt(roomPitBean.getUser_id()) == message.getText().getFromUserInfo().getUser_id()){
+            if (Integer.parseInt(roomPitBean.getUser_id()) == message.getText().getFromUserInfo().getUser_id()) {
                RoomFriendshipWheatView object = mWheatViews.get(i);
                if (object != null) {
                    object.setData(roomPitBean);
@@ -511,6 +520,11 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
        if (fromPit.equals("") || toPitNumber.equals("")) {
            return;
        }
+        if (Integer.parseInt(toPitNumber) == 7 || Integer.parseInt(toPitNumber) == 8 ||
+                Integer.parseInt(toPitNumber) > 10 ||
+                (Integer.parseInt(toPitNumber) == 0 || Integer.parseInt(fromPit) == 0)) {
+            return;
+        }
        RoomFriendshipWheatView fromWheatView = mWheatViews.get(Integer.parseInt(fromPit) - 1);
        RoomFriendshipWheatView toWheatView = mWheatViews.get(Integer.parseInt(toPitNumber) - 1);
        RoomPitBean fromPitBean = fromWheatView.pitBean;
@@ -680,11 +694,12 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
        // 设置弹出视图中的点击事件
        setPopupMenuClickListener(popupView, null);
    }
+
    @SuppressLint("UseSwitchCompatOrMaterialCode")
    private void setPopupMenuClickListener(View popupView, View view) {

        TextView tvHugMic = popupView.findViewById(R.id.tv_hug_mic);
-         Switch switchCloseMic = popupView.findViewById(R.id.sw_close_mic);
+        Switch switchCloseMic = popupView.findViewById(R.id.sw_close_mic);
        Switch switchLockMic = popupView.findViewById(R.id.sw_lock_mic);
        switchLockMic.setVisibility(GONE);
        TextView tv_lock_mic = popupView.findViewById(R.id.tv_lock_mic);
@@ -862,6 +877,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese

        // 可以根据需要更新其他UI元素
    }
+
    /**
     * 心动数值变化
     */