From e32d450ca10b0deabdf05a66bd6c44387141073c Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Fri, 21 Jul 2023 09:45:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9A=8F=E6=9C=BAPK=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E5=9C=A8=E8=8B=B1=E6=96=87=E6=A8=A1=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?=E8=BF=87=E9=95=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/manager/RandomPkManager.java       |   2 +-
 .../main/res/layout/item_random_pk_info.xml   | 127 +++++++++---------
 2 files changed, 68 insertions(+), 61 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/manager/RandomPkManager.java b/common/src/main/java/com/yunbao/common/manager/RandomPkManager.java
index da756f4c8..a5a85961a 100644
--- a/common/src/main/java/com/yunbao/common/manager/RandomPkManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/RandomPkManager.java
@@ -401,7 +401,7 @@ public class RandomPkManager {
      * 清空状态，下播时调用
      */
     public void release() {
-        status = PK_STATUS_REQUEST;
+        status = PK_STATUS_DEFAULT;
         if (task != null) {
             task.cancel();
         }
diff --git a/live/src/main/res/layout/item_random_pk_info.xml b/live/src/main/res/layout/item_random_pk_info.xml
index 86f6ccea9..a823df8a3 100644
--- a/live/src/main/res/layout/item_random_pk_info.xml
+++ b/live/src/main/res/layout/item_random_pk_info.xml
@@ -6,79 +6,86 @@
     android:layout_height="wrap_content"
     android:visibility="visible">
 
-    <LinearLayout
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/linearLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
-        android:background="@drawable/background_7792d0"
-        android:orientation="vertical"
+        android:layout_height="230dp"
+        android:fillViewport="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:layout_marginTop="15dp"
-            android:text="@string/random_pk_info_title"
-            android:textColor="#F6F7FB"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="10dp"
             android:layout_marginEnd="10dp"
+            android:background="@drawable/background_7792d0"
+            android:orientation="vertical">
 
-            android:text="@string/random_pk_info_desc_1"
-            android:textColor="#F6F7FB"
-            android:textSize="14sp" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="15dp"
+                android:text="@string/random_pk_info_title"
+                android:textColor="#F6F7FB"
+                android:textSize="16sp"
+                android:textStyle="bold" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="10dp"
-            android:text="@string/random_pk_info_desc_2"
-            android:textColor="#F6F7FB"
-            android:textSize="14sp" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="10dp"
-            android:text="@string/random_pk_info_desc_3"
-            android:textColor="#F6F7FB"
-            android:textSize="14sp" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="15dp"
-            android:text="@string/random_pk_info_time_desc"
-            android:textColor="#F6F7FB"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="15dp"
-            android:text="@string/random_pk_info_time"
-            android:textColor="#F6F7FB"
-            android:textSize="14sp" />
-    </LinearLayout>
+                android:text="@string/random_pk_info_desc_1"
+                android:textColor="#F6F7FB"
+                android:textSize="14sp" />
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:text="@string/random_pk_info_desc_2"
+                android:textColor="#F6F7FB"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:text="@string/random_pk_info_desc_3"
+                android:textColor="#F6F7FB"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="15dp"
+                android:text="@string/random_pk_info_time_desc"
+                android:textColor="#F6F7FB"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="15dp"
+                android:text="@string/random_pk_info_time"
+                android:textColor="#F6F7FB"
+                android:textSize="14sp" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"