From 03621f4c15baf55769ebe06f45fee3affb6b3dc4 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Fri, 19 Aug 2022 19:03:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E6=92=AD=E6=88=BF=E6=BB=91=E5=8A=A8bu?=
 =?UTF-8?q?gfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yizhuan/erban/avroom/activity/AVRoomActivity.java  | 7 +++++--
 .../erban/avroom/fragment/FakeSingleRoomFragment.kt        | 3 ++-
 2 files changed, 7 insertions(+), 3 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 b391af95c..85c05f31c 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
@@ -378,12 +378,16 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
 
     private void initIntentExtra(Intent intent) {
         if (intent == null) return;
-        roomUid = getIntent().getLongExtra(Constants.ROOM_UID, 0);
         fromType = intent.getIntExtra("fromType", 0);
         fromNick = intent.getStringExtra("fromNick");
         fromUid = intent.getStringExtra("fromUid");
         giftId = intent.getIntExtra("giftId", 0);
         mRoomInfo = intent.getParcelableExtra(Constants.ROOM_INFO);
+        if (mRoomInfo != null) {
+            roomUid = mRoomInfo.getRoomUid();
+        } else {
+            roomUid = getIntent().getLongExtra(Constants.ROOM_UID, 0);
+        }
     }
 
     @SuppressLint("CheckResult")
@@ -416,7 +420,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
             viewpager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
                 @Override
                 public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-                    LogUtils.d("position = " + position + " positionOffset = " + positionOffset + "  positionOffsetPixels = " + positionOffsetPixels);
                     if (positionOffset > 0 && position == 1) {
                         if (mAdapter == null || mAdapter.getItem(2) == null) return;
                         ((FakeSingleRoomFragment) mAdapter.getItem(2)).requestPreRoomInfo();
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/FakeSingleRoomFragment.kt b/app/src/main/java/com/yizhuan/erban/avroom/fragment/FakeSingleRoomFragment.kt
index bb91be9ad..211bdbc2c 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/FakeSingleRoomFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/FakeSingleRoomFragment.kt
@@ -8,6 +8,7 @@ import com.opensource.svgaplayer.SVGAVideoEntity
 import com.yizhuan.erban.avroom.activity.AVRoomActivity
 import com.yizhuan.erban.base.BaseViewBindingFragment
 import com.yizhuan.erban.databinding.FragmentFakeSingleRoomBinding
+import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
 import com.yizhuan.xchat_android_core.room.bean.RoomInfo
 import com.yizhuan.xchat_android_core.room.event.SwitchRoomEvent
 import com.yizhuan.xchat_android_core.room.model.AvRoomModel
@@ -74,7 +75,7 @@ class FakeSingleRoomFragment : BaseViewBindingFragment<FragmentFakeSingleRoomBin
     }
 
     private fun jumpRoom(roomInfo: RoomInfo) {
-        EventBus.getDefault().post(SwitchRoomEvent(roomInfo))
+        EventBus.getDefault().post(SwitchRoomEvent(AvRoomDataManager.get().mCurrentRoomInfo))
         AVRoomActivity.start(mContext, roomInfo)
         reSet()
     }