From d31af73479a8537ad9d0d0825c540799dc82b8b9 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 27 Dec 2022 10:03:05 +0800
Subject: [PATCH] =?UTF-8?q?PK=E7=BB=93=E6=9D=9F=E6=B6=88=E5=A4=B1PK?=
 =?UTF-8?q?=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.gradle                                               | 4 ++--
 .../java/com/yunbao/live/activity/LiveRyAnchorActivity.java | 5 +++++
 .../com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java | 6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/config.gradle b/config.gradle
index ac60b7e57..6f21be570 100644
--- a/config.gradle
+++ b/config.gradle
@@ -10,9 +10,9 @@ ext {
     manifestPlaceholders = [
             //正式
 
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
 //            測試
-            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",
 
             //腾讯地图
             txMapAppKey      : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
diff --git a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
index 8a46d8030..a7e4a792c 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
@@ -1501,6 +1501,11 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
                     mLivePushViewHolder.changeToBig();
                 }
                 break;
+            case AI_AUTOMATIC_SPEECH:
+                if (mLiveRoomViewHolder != null) {
+                    mLiveRoomViewHolder.aiAutomaticSpeech((event.getAiAutomaticSpeechModel()));
+                }
+                break;
 
         }
     }
diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
index 370ce2659..4afb31a72 100644
--- a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
+++ b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
@@ -391,6 +391,12 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
                 if (mIsAnchor) {
                     ((LiveRyAnchorActivity) mContext).setPkBtnVisible(true);
                 }
+                //如果PK结束Im没有发送关闭PK的消息，倒计时结束自动关闭
+                if (mLiveLinkMicPkViewHolder != null) {
+                    mLiveLinkMicPkViewHolder.removeFromParent();
+                    mLiveLinkMicPkViewHolder.release();
+                }
+                mLiveLinkMicPkViewHolder = null;
             }
         }
     }