From 2e986db686d812d8e0238aef59bd7066591b201c Mon Sep 17 00:00:00 2001
From: 18142669586 <1669783059@qq.com>
Date: Thu, 29 Dec 2022 16:12:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=96=AE=E4=BA=BAPK=E5=8D=A10=E5=88=86=20?=
 =?UTF-8?q?=E5=84=AA=E5=8C=96=E8=A8=88=E7=AE=97=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/live/presenter/LiveRyLinkMicPkPresenter.java   | 8 ++++----
 .../com/yunbao/live/views/LiveLinkMicPkViewHolder.java    | 8 ++++++--
 live/src/main/res/layout/view_live_push_ry.xml            | 4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

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 e5993db45..0c457eab4 100644
--- a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
+++ b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
@@ -394,10 +394,10 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
                     ((LiveRyAnchorActivity) mContext).setPkBtnVisible(true);
                 }
                 //如果PK结束Im没有发送关闭PK的消息，倒计时结束自动关闭
-                if (mLiveLinkMicPkViewHolder != null) {
-                    mLiveLinkMicPkViewHolder.removeFromParent();
-                    mLiveLinkMicPkViewHolder.release();
-                }
+//                if (mLiveLinkMicPkViewHolder != null) {
+//                    mLiveLinkMicPkViewHolder.removeFromParent();
+//                    mLiveLinkMicPkViewHolder.release();
+//                }
                 mLiveLinkMicPkViewHolder = null;
             }
         }
diff --git a/live/src/main/java/com/yunbao/live/views/LiveLinkMicPkViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveLinkMicPkViewHolder.java
index 616b14366..c83022461 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveLinkMicPkViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveLinkMicPkViewHolder.java
@@ -190,8 +190,12 @@ public class LiveLinkMicPkViewHolder extends AbsViewHolder {
 
     public void setTime(String content) {
         if (mTime != null) {
-
-            mTime.setText(content);
+            Log.i("vvvs",content);
+            if(content.trim().equals("00:01")||content.trim().equals("00:00")){
+                mTime.setText("計算中");
+            }else {
+                mTime.setText(content);
+            }
         }
     }
 
diff --git a/live/src/main/res/layout/view_live_push_ry.xml b/live/src/main/res/layout/view_live_push_ry.xml
index 877d2519c..733b3d72f 100644
--- a/live/src/main/res/layout/view_live_push_ry.xml
+++ b/live/src/main/res/layout/view_live_push_ry.xml
@@ -110,7 +110,7 @@
         android:layout_width="wrap_content"
         android:layout_height="27dp"
         android:layout_alignParentRight="true"
-        android:layout_marginTop="120dp"
+        android:layout_marginTop="122dp"
         android:layout_marginRight="9dp"
         android:background="@drawable/bg_live_other_ico"
         android:gravity="center">
@@ -174,7 +174,7 @@
         android:paddingBottom="5dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
-        android:layout_marginTop="420dp"
+        android:layout_marginTop="400dp"
         android:layout_marginRight="8dp"
         android:layout_alignParentRight="true"
         android:text="結束連麥"