From 50f7f161ff7e5fd9375853e089088548d2c7e665 Mon Sep 17 00:00:00 2001
From: xuhuixiang <xuhuixiang@email-dskj.com>
Date: Sat, 7 Feb 2026 10:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xyz/babelive/api/ApiService.java |  1 +
 .../xyz/babelive/bean/TodayMatchesBean.java   | 13 +++++++++++--
 .../ui/activity/GameAliPortraitActivity.java  |  9 +++++++--
 .../ui/fragment/game/ChatFragment.java        | 19 ++++++++++++++++---
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/xyz/babelive/api/ApiService.java b/app/src/main/java/com/xyz/babelive/api/ApiService.java
index 526b1fa..ae2ab1d 100644
--- a/app/src/main/java/com/xyz/babelive/api/ApiService.java
+++ b/app/src/main/java/com/xyz/babelive/api/ApiService.java
@@ -47,6 +47,7 @@ import retrofit2.http.Query;
 public interface ApiService {
 
     String URL = "https://www.bab3live.com";
+
 //    String URL="https://babelive.my";
 
     String LivePLayerStartUrl = "https://play.bab3live.com/live/";
diff --git a/app/src/main/java/com/xyz/babelive/bean/TodayMatchesBean.java b/app/src/main/java/com/xyz/babelive/bean/TodayMatchesBean.java
index 49d7c90..1f43999 100644
--- a/app/src/main/java/com/xyz/babelive/bean/TodayMatchesBean.java
+++ b/app/src/main/java/com/xyz/babelive/bean/TodayMatchesBean.java
@@ -103,7 +103,12 @@ public class TodayMatchesBean implements Serializable {
         if(TextUtils.isEmpty(callbackData)){
             return 0;
         }
-        return getCallbackDataWH(true);
+
+        if(callbackData.contains("{")&&callbackData.contains("}")) {
+            return getCallbackDataWH(true);
+        }else{
+            return 0;
+        }
     }
 
     private Integer getCallbackDataWH(boolean isWidth) {
@@ -131,7 +136,11 @@ public class TodayMatchesBean implements Serializable {
         if(TextUtils.isEmpty(callbackData)){
             return 0;
         }
-        return getCallbackDataWH(false);
+        if(callbackData.contains("{")&&callbackData.contains("}")) {
+            return getCallbackDataWH(false);
+        }else{
+            return 0;
+        }
     }
 
     public void setHeight(Integer height) {
diff --git a/app/src/main/java/com/xyz/babelive/ui/activity/GameAliPortraitActivity.java b/app/src/main/java/com/xyz/babelive/ui/activity/GameAliPortraitActivity.java
index 6a05513..6b78676 100644
--- a/app/src/main/java/com/xyz/babelive/ui/activity/GameAliPortraitActivity.java
+++ b/app/src/main/java/com/xyz/babelive/ui/activity/GameAliPortraitActivity.java
@@ -210,6 +210,8 @@ public class GameAliPortraitActivity extends BaseActivity<MainViewModel, Activit
                 dataBinding.messageEt.setText("");
                 isInit = true;
                 String address = ApiService.URL + "/ws/stomp/endpoint/websocket?token=" + InitApp.getAccessTokenBase();
+//                address = "http://192.168.0.165:8080/stomp/endpoint/websocket?token=" + InitApp.getAccessTokenBase();
+
                 mStompClient = Stomp.over(Stomp.ConnectionProvider.OKHTTP, address);
                 mStompClient.connect();
                 lifecycle(mStompClient);
@@ -574,17 +576,20 @@ public class GameAliPortraitActivity extends BaseActivity<MainViewModel, Activit
                     }
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("type", "TEXT");
-                    jsonObject.put("roomId", "leagues_" + todayMatchesBean.getId());
                     jsonObject.put("messageId", UUID.randomUUID().toString());
                     jsonObject.put("timestamp", System.currentTimeMillis());
-                    jsonObject.put("senderId", userBean.getUserId());
+                    jsonObject.put("senderId", userBean.getUserId()+"");
                     jsonObject.put("senderName", userBean.getNickName());
                     jsonObject.put("avatar", userBean.getAvatar());
                     jsonObject.put("content", dataBinding.messageEt.getText().toString().trim());
 
                     String rooms = "/topic/rooms/leagues_" + todayMatchesBean.getId();
+                    jsonObject.put("roomId","leagues_" + todayMatchesBean.getId());
+
                     if (!TextUtils.isEmpty(todayMatchesBean.getChannelName())) {
                         rooms = "/topic/rooms/" + todayMatchesBean.getChannelName();
+                        jsonObject.put("roomId",todayMatchesBean.getChannelName());
+
                     }
 
                     mStompClient.send(rooms, jsonObject.toString()).subscribe();
diff --git a/app/src/main/java/com/xyz/babelive/ui/fragment/game/ChatFragment.java b/app/src/main/java/com/xyz/babelive/ui/fragment/game/ChatFragment.java
index b4ddd5f..013b03f 100644
--- a/app/src/main/java/com/xyz/babelive/ui/fragment/game/ChatFragment.java
+++ b/app/src/main/java/com/xyz/babelive/ui/fragment/game/ChatFragment.java
@@ -50,6 +50,7 @@ import java.util.UUID;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
+import io.reactivex.exceptions.OnErrorNotImplementedException;
 import io.reactivex.schedulers.Schedulers;
 import ua.naiksoftware.stomp.Stomp;
 import ua.naiksoftware.stomp.StompClient;
@@ -193,6 +194,8 @@ public class ChatFragment extends BaseLazyFragment<MainViewModel, FragmentChatBi
                 dataBinding.messageEt.setText("");
                 isInit = true;
                 String address = ApiService.URL + "/ws/stomp/endpoint/websocket?token=" + InitApp.getAccessTokenBase();
+//                address = "http://192.168.0.165:8080/stomp/endpoint/websocket?token=" + InitApp.getAccessTokenBase();
+                LogUtils.i("SOCKET地址："+address);
                 mStompClient = Stomp.over(Stomp.ConnectionProvider.OKHTTP, address);
                 mStompClient.connect();
                 lifecycle(mStompClient);
@@ -223,19 +226,24 @@ public class ChatFragment extends BaseLazyFragment<MainViewModel, FragmentChatBi
                     }
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("type", "TEXT");
-                    jsonObject.put("roomId", "leagues_" + todayMatchesBean.getId());
                     jsonObject.put("messageId", UUID.randomUUID().toString());
                     jsonObject.put("timestamp", System.currentTimeMillis());
-                    jsonObject.put("senderId", userBean.getUserId());
+                    jsonObject.put("senderId", userBean.getUserId()+"");
                     jsonObject.put("senderName", userBean.getNickName());
                     jsonObject.put("avatar", userBean.getAvatar());
                     jsonObject.put("content", dataBinding.messageEt.getText().toString().trim());
 
                     String rooms = "/topic/rooms/leagues_" + todayMatchesBean.getId();
+                    jsonObject.put("roomId","leagues_" + todayMatchesBean.getId());
+
                     if (!TextUtils.isEmpty(todayMatchesBean.getChannelName())) {
                         rooms = "/topic/rooms/" + todayMatchesBean.getChannelName();
+                        jsonObject.put("roomId",todayMatchesBean.getChannelName());
                     }
 
+//                    LogUtils.i("房间号："+rooms);
+//                    LogUtils.i("房间号1："+jsonObject.toString());
+
                     mStompClient.send(rooms, jsonObject.toString()).subscribe();
                     dataBinding.messageEt.setText("");
                 } else {
@@ -420,7 +428,12 @@ public class ChatFragment extends BaseLazyFragment<MainViewModel, FragmentChatBi
     @Override
     public void onDestroyView() {
         if(mStompClient!=null) {
-            mStompClient.disconnect();
+            try {
+                mStompClient.disconnect();
+
+            }catch (OnErrorNotImplementedException e){
+
+            }
         }
 
         if (compositeDisposable != null) compositeDisposable.dispose();