From 2acba510f78ab3356aab18e4e6b27f57046b88a8 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Wed, 31 Aug 2022 16:32:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=B0=8F=E6=97=B6?=
 =?UTF-8?q?=E6=A6=9C=E7=82=B9=E8=87=AA=E5=B7=B1=E7=9B=B4=E6=92=AD=E9=97=B4?=
 =?UTF-8?q?=E4=BC=9A=E8=B7=B3=E8=BD=AC=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yunbao/live/dialog/LiveHDDialogFragment.java    | 5 +++++
 .../main/java/com/yunbao/live/views/LiveRoomViewHolder.java  | 1 +
 2 files changed, 6 insertions(+)

diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java
index 67b9c19b2..b53d052ee 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java
@@ -47,6 +47,7 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
     private WebView mWebView;
     private int showType = 0;
     private boolean isFullWindow=false;
+    private String roomId;
 
     public LiveHDDialogFragment() {
 
@@ -145,6 +146,7 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
         if (bundle == null) {
             return;
         }
+        roomId=bundle.getString("roomId",null);
         mWebView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true); // 是否允许JS打开新窗口
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
@@ -248,6 +250,9 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
     }
     private LiveRoomCheckLivePresenter mCheckLivePresenter;
     private void gotoLive(final String live_id) {
+        if(roomId!=null&&roomId.equals(live_id)){
+            return;
+        }
         LiveHttpUtil.getLiveInfo(live_id, new HttpCallback() {
             @Override
             public void onSuccess(int code, String msg, String[] info) {
diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index 156eacdb2..01b0c7d4c 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -1120,6 +1120,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                             bundle.putString("url", url);
                             bundle.putInt("height", DpUtil.dp2px(500));
                             bundle.putInt("show_type", 0);
+                            bundle.putString("roomId",mLiveUid);
                             LiveHDDialogFragment liveHDDialogFragment = new LiveHDDialogFragment();
                             liveHDDialogFragment.setArguments(bundle);
                             liveHDDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");