From 54923304dc47be872410bf401aa5f980e872e0af Mon Sep 17 00:00:00 2001
From: 18142669586 <1669783059@qq.com>
Date: Fri, 30 Dec 2022 14:57:47 +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

---
 .../com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java   | 4 ++--
 .../java/com/yunbao/live/views/LiveLinkMicPkViewHolder.java   | 4 ++--
 live/src/main/res/layout/view_live_push_ry.xml                | 1 +
 3 files changed, 5 insertions(+), 4 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 0c457eab4..942d7f701 100644
--- a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
+++ b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
@@ -385,7 +385,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
      */
     private void changePkTime() {
         mPkTimeCount--;
-        if (mPkTimeCount > 0) {//
+        if (mPkTimeCount >= 0) {//
             nextPkTimeCountDown();
         } else {
             if (mIsPkEnd) {
@@ -398,7 +398,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
 //                    mLiveLinkMicPkViewHolder.removeFromParent();
 //                    mLiveLinkMicPkViewHolder.release();
 //                }
-                mLiveLinkMicPkViewHolder = null;
+//                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 c83022461..0a83e1c49 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveLinkMicPkViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveLinkMicPkViewHolder.java
@@ -191,8 +191,8 @@ public class LiveLinkMicPkViewHolder extends AbsViewHolder {
     public void setTime(String content) {
         if (mTime != null) {
             Log.i("vvvs",content);
-            if(content.trim().equals("00:01")||content.trim().equals("00:00")){
-                mTime.setText("計算中");
+            if(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 733b3d72f..550226de5 100644
--- a/live/src/main/res/layout/view_live_push_ry.xml
+++ b/live/src/main/res/layout/view_live_push_ry.xml
@@ -112,6 +112,7 @@
         android:layout_alignParentRight="true"
         android:layout_marginTop="122dp"
         android:layout_marginRight="9dp"
+        android:visibility="gone"
         android:background="@drawable/bg_live_other_ico"
         android:gravity="center">