From 80e21bee74ab33752b1b3687058a5e366643b00b Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Mon, 30 Oct 2023 15:16:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=88=BF=E9=97=B4?=
 =?UTF-8?q?=E5=86=85=E7=82=B9=E5=87=BB=E7=BA=A2=E5=8C=85=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=88=B0=E5=85=B6=E4=BB=96=E6=88=BF=E9=97=B4=E5=90=8E=E6=B2=A1?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E7=BA=A2=E5=8C=85=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/avroom/activity/AVRoomActivity.java  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
index b65cb15db..03bbcc699 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
@@ -225,10 +225,10 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
     private GiftBroadcastObserver giftObserver;
     private Dialog giftDialog;
     private LinkedList<AllServiceGiftProtocol.DataBean> giftList;
-    private boolean isResume = true;
     @Nullable
     private SingleRoomTipDialog singleRoomTipDialog;
-
+    // 通过红包进来时，有该参数
+    private RedPackageNotifyInfo redPackageNotifyInfo;
     public static void start(Context context, long roomUid) {
         startForFromType(context, roomUid, FROM_TYPE_NORMAL, null, null);
     }
@@ -412,6 +412,12 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
         fromUid = intent.getStringExtra("fromUid");
         giftId = intent.getIntExtra("giftId", 0);
         mRoomInfo = intent.getParcelableExtra(Constants.ROOM_INFO);
+        Object notifyInfo = intent.getSerializableExtra("notifyInfo");
+        if (notifyInfo instanceof RedPackageNotifyInfo) {
+            redPackageNotifyInfo = (RedPackageNotifyInfo) notifyInfo;
+        }else{
+            redPackageNotifyInfo = null;
+        }
         if (mRoomInfo != null) {
             roomUid = mRoomInfo.getRoomUid();
         } else {
@@ -510,7 +516,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
         if (giftList != null) {
             giftList.clear();
         }
-        isResume = true;
     }
 
     private void onRoomEventReceive(RoomEvent roomEvent) {
@@ -727,11 +732,10 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
      */
     private void tryShowSourceRedPackage() {
         try {
-            RedPackageNotifyInfo inRoomNotifyInfo = (RedPackageNotifyInfo) getIntent().getSerializableExtra("notifyInfo");
-            if (inRoomNotifyInfo != null) {
+            if (redPackageNotifyInfo != null) {
                 RedPackageHandler handler = getRoomContext().findAbility(RedPackageHandler.class.getSimpleName());
                 if (handler != null) {
-                    long id = Long.parseLong(inRoomNotifyInfo.getRedEnvelopeId());
+                    long id = Long.parseLong(redPackageNotifyInfo.getRedEnvelopeId());
                     handler.tryShowRedPackage(id);
                 }
             }
@@ -1340,10 +1344,8 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
     protected void onPause() {
         super.onPause();
         registerGiftBroadcastMessage(false);
-        isResume = false;
     }
 
-
     private void handlePmExitRoom() {
         EventBus.getDefault().post(new PmDismissAllLimitDialogEvent());
         getMvpPresenter().exitRoom();