From d06f4599fafafa88bf8ae176c93b687e58892b73 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Wed, 3 Apr 2024 15:23:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20[=E5=9C=A8=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E9=97=B4=E4=B8=AD=EF=BC=8C=E7=82=B9=E5=87=BB=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E5=BC=B9=E7=AA=97=EF=BC=8C=E8=BF=9B=E5=85=A5=E8=81=8A?=
 =?UTF-8?q?=E5=A4=A9=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E3=80=90=E7=AB=99=E5=86=85=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E3=80=91=EF=BC=8C=E6=97=A0=E6=B3=95=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../provider/MessageChatCardItemProvider.java | 17 +++++++++---
 .../com/yunbao/common/utils/AppManager.java   | 26 ++++++++++++++++---
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/provider/MessageChatCardItemProvider.java b/common/src/main/java/com/yunbao/common/provider/MessageChatCardItemProvider.java
index 2d72e7d9e..76df8477e 100644
--- a/common/src/main/java/com/yunbao/common/provider/MessageChatCardItemProvider.java
+++ b/common/src/main/java/com/yunbao/common/provider/MessageChatCardItemProvider.java
@@ -1,5 +1,6 @@
 package com.yunbao.common.provider;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.text.Spannable;
@@ -10,11 +11,13 @@ import com.yunbao.common.Constants;
 import com.yunbao.common.R;
 import com.yunbao.common.bean.ActiveBean;
 import com.yunbao.common.bean.LiveBean;
+import com.yunbao.common.event.LiveRoomChangeEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.message.content.MessageChatCardContent;
+import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.common.utils.MicStatusManager;
 import com.yunbao.common.utils.RouteUtil;
@@ -61,9 +64,9 @@ public class MessageChatCardItemProvider extends BaseMessageItemProvider<Message
     protected boolean onItemClick(ViewHolder holder, MessageChatCardContent content, UiMessage uiMessage, int position, List<UiMessage> list, IViewProviderListener<UiMessage> listener) {
         if ("1".equals(content.getType())) {
             gotoLive(content.getExtraData());
-        }else if("0".equals(content.getType())){
+        } else if ("0".equals(content.getType())) {
             RouteUtil.forwardCommunity(content.getExtraData());
-        }else if("2".equals(content.getType())){
+        } else if ("2".equals(content.getType())) {
             LiveNetManager.get(mContext).getDynamicInfo(content.getExtraData(), new com.yunbao.common.http.base.HttpCallback<ActiveBean>() {
                 @Override
                 public void onSuccess(ActiveBean data) {
@@ -105,7 +108,15 @@ public class MessageChatCardItemProvider extends BaseMessageItemProvider<Message
                                 MicStatusManager.getInstance().showDownMicDialog(mContext);
                                 return;
                             }
-                            RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
+                            if (AppManager.getInstance().getLiveActivity() != null) {
+                                EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)).setLiveEnd(true));
+                                Activity activity = AppManager.getActivity("PDLiveConversationActivity");
+                                if (activity != null) {
+                                    activity.finish();
+                                }
+                            } else {
+                                RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
+                            }
                         }
 
                         @Override
diff --git a/common/src/main/java/com/yunbao/common/utils/AppManager.java b/common/src/main/java/com/yunbao/common/utils/AppManager.java
index f1a07032f..8aadb61a5 100644
--- a/common/src/main/java/com/yunbao/common/utils/AppManager.java
+++ b/common/src/main/java/com/yunbao/common/utils/AppManager.java
@@ -20,15 +20,33 @@ public class AppManager {
         return SingleApp.INSTANCE;
     }
 
+    public static Activity getActivity(String activityName) {
+        for (Activity activity : activityStack) {
+            if (activity.getClass().getSimpleName().contains(activityName)) {
+                return activity;
+            }
+        }
+        return null;
+    }
+
     public Activity getMainActivity() {
         for (Activity activity : activityStack) {
-            if(activity.getClass().getSimpleName().contains("MainActivity")){
+            if (activity.getClass().getSimpleName().contains("MainActivity")) {
                 return activity;
             }
         }
         return getLastActivity();
     }
 
+    public Activity getLiveActivity() {
+        for (Activity activity : activityStack) {
+            if (activity.getClass().getSimpleName().contains("LiveAudienceActivity")) {
+                return activity;
+            }
+        }
+        return null;
+    }
+
     public static class SingleApp {
         public static AppManager INSTANCE = new AppManager();
     }
@@ -67,11 +85,11 @@ public class AppManager {
      * 获取当前显示Activity（堆栈中最后一个传入的activity）
      */
     public Activity getLastActivity() {
-        if(activityStack.isEmpty()){
+        if (activityStack.isEmpty()) {
             return null;
         }
         Activity activity = activityStack.lastElement();
-        if(activity==null||activity.isFinishing()){
+        if (activity == null || activity.isFinishing()) {
             activityStack.remove(activity);
             return getLastActivity();
         }
@@ -133,7 +151,7 @@ public class AppManager {
     }
 
     /**
-     *仅在debug下运行的代码
+     * 仅在debug下运行的代码
      */
     public static void runDebugCode(Runnable runnable) {
         if (BuildConfig.DEBUG) {