From c0663e4aa89430ad8ab52249911b0e931b549b23 Mon Sep 17 00:00:00 2001
From: max <mxruan@163.com>
Date: Fri, 19 Apr 2024 17:18:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5PIKO=EF=BC=9A=E4=BA=91?=
 =?UTF-8?q?=E4=BF=A1=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8D=95=E8=8E=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chwl/app/avroom/activity/AVRoomActivity.java   | 14 +++++++-------
 .../main/java/com/chwl/app/base/BaseActivity.java  | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java
index eeb59a073..e59c9582b 100644
--- a/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java
+++ b/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java
@@ -1391,14 +1391,14 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
                     JSONObject jsonObject;
                     try {
                         jsonObject = JSON.parseObject(contentStr);
+                        if (jsonObject == null) return;
+                        if (jsonObject.containsKey("body")) {
+                            String body = jsonObject.getString("body");
+                            if (TextUtils.isEmpty(body)) return;
+                            activity.onReceivedGiftBroadcastMessage(body);
+                        }
                     } catch (Exception e) {
-                        jsonObject = null;
-                    }
-                    if (jsonObject == null) return;
-                    if (jsonObject.containsKey("body")) {
-                        String body = jsonObject.getString("body");
-                        if (TextUtils.isEmpty(body)) return;
-                        activity.onReceivedGiftBroadcastMessage(body);
+                        e.printStackTrace();
                     }
                 }
             }
diff --git a/app/src/main/java/com/chwl/app/base/BaseActivity.java b/app/src/main/java/com/chwl/app/base/BaseActivity.java
index acf44b0c6..9d5e13313 100644
--- a/app/src/main/java/com/chwl/app/base/BaseActivity.java
+++ b/app/src/main/java/com/chwl/app/base/BaseActivity.java
@@ -1378,14 +1378,14 @@ public abstract class BaseActivity extends RxAppCompatActivity
                     JSONObject jsonObject;
                     try {
                         jsonObject = JSON.parseObject(contentStr);
+                        if (jsonObject == null) return;
+                        if (jsonObject.containsKey("body")) {
+                            String body = jsonObject.getString("body");
+                            if (TextUtils.isEmpty(body)) return;
+                            baseMvpActivity.onReceivedNimBroadcastMessage(body);
+                        }
                     } catch (Exception e) {
-                        jsonObject = null;
-                    }
-                    if (jsonObject == null) return;
-                    if (jsonObject.containsKey("body")) {
-                        String body = jsonObject.getString("body");
-                        if (TextUtils.isEmpty(body)) return;
-                        baseMvpActivity.onReceivedNimBroadcastMessage(body);
+                        e.printStackTrace();
                     }
                 }
             }