From c20312b982d75a1ddd5f285059889eee031814ad Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Fri, 18 Aug 2023 18:43:47 +0800
Subject: [PATCH] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yunbao/common/activity/WebViewActivity.java   | 1 +
 config.gradle                                                   | 2 +-
 .../main/java/com/yunbao/live/activity/GiftWallActivity.java    | 2 +-
 .../main/java/com/yunbao/live/activity/ZhuangBanActivity.java   | 1 +
 .../main/java/com/yunbao/main/activity/ZhuangBanActivity.java   | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java b/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
index fa6325898..3c4367d58 100644
--- a/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
+++ b/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
@@ -406,6 +406,7 @@ public class WebViewActivity extends AbsActivity {
                                 return;
                             }
                             EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)).setLiveEnd(true));
+                            finish();
                         }
 
                         @Override
diff --git a/config.gradle b/config.gradle
index 8c5ed6f4c..d0e2bbf1b 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,7 +4,7 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
             targetSdkVersion : 31,
-            versionCode      : 443,
+            versionCode      : 444,
             versionName      : "6.5.4"
     ]
     manifestPlaceholders = [
diff --git a/live/src/main/java/com/yunbao/live/activity/GiftWallActivity.java b/live/src/main/java/com/yunbao/live/activity/GiftWallActivity.java
index a9bdcdaa0..840ce3226 100644
--- a/live/src/main/java/com/yunbao/live/activity/GiftWallActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/GiftWallActivity.java
@@ -118,7 +118,7 @@ public class GiftWallActivity extends AbsActivity {
             public void onViewClicks() {
                 new XPopup.Builder(GiftWallActivity.this)
                         .enableDrag(false)
-                        .asCustom(new CodexDialog(GiftWallActivity.this, mStream, mLiveUid, mLiveUid,isLive,false))
+                        .asCustom(new CodexDialog(GiftWallActivity.this, mStream, mLiveUid, mLiveUid,false,false))
                         .show();
             }
         });
diff --git a/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java b/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java
index 390976a5d..b32d7d94d 100644
--- a/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java
@@ -407,6 +407,7 @@ public class ZhuangBanActivity extends AbsActivity {
                                 return;
                             }
                             EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)).setLiveEnd(true));
+                            finish();
                         }
 
                         @Override
diff --git a/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java b/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
index c227c9c6f..801541a2d 100644
--- a/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
@@ -391,6 +391,7 @@ public class ZhuangBanActivity extends AbsActivity {
                         @Override
                         public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
                             RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal));
+                            finish();
                         }
 
                         @Override