From 45a5d6ad615701642c8fa631689eead159b4a663 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Mon, 9 Oct 2023 17:24:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../live/presenter/LiveLinkMicPresenter.java  |   2 +-
 .../layout/dialog_live_free_pk_function.xml   | 100 ++++++++++--------
 2 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPresenter.java
index 983bc7b5a..9cd0f1f4f 100644
--- a/live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPresenter.java
+++ b/live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPresenter.java
@@ -258,7 +258,7 @@ public class LiveLinkMicPresenter implements View.OnClickListener {
             mIsLinkMic = true;
             mLinkMicUid = CommonAppConfig.getInstance().getUid();
             if (mLinkMicTip != null) {
-                mLinkMicTip.setText(R.string.live_link_mic_3);
+                mLinkMicTip.setText(mContext.getString(R.string.live_link_mic_3));
             }
             LiveHttpUtil.getLinkMicStream(new HttpCallback() {
                 @Override
diff --git a/live/src/main/res/layout/dialog_live_free_pk_function.xml b/live/src/main/res/layout/dialog_live_free_pk_function.xml
index 1a46603f2..43426326c 100644
--- a/live/src/main/res/layout/dialog_live_free_pk_function.xml
+++ b/live/src/main/res/layout/dialog_live_free_pk_function.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="430dp"
     android:background="@drawable/bg_live_tota">
@@ -53,7 +52,7 @@
                     app:tabIndicator="@drawable/random_pk_shape_tab_indicator"
                     app:tabIndicatorColor="#F6F7FB"
                     app:tabIndicatorFullWidth="false"
-                    app:tabMaxWidth="100dp"
+                    app:tabMaxWidth="130dp"
                     app:tabMode="scrollable"
                     app:tabSelectedTextColor="#F6F7FB"
                     app:tabTextColor="#9A9A9A" />
@@ -119,48 +118,65 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
-        <TextView
-            android:id="@+id/tmp_text1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:text="自由PK剩余次數"
-            android:textColor="#9A9A9A"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center">
 
-        <TextView
-            android:id="@+id/free_pk_num"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
-            android:text="-2"
-            android:textColor="#FFFFFF"
-            android:textSize="16sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/tmp_text1"
-            app:layout_constraintTop_toTopOf="parent" />
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="20dp"
+                android:layout_weight="1">
+
+                <TextView
+                    android:id="@+id/tmp_text1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:text="自由PK剩余次數"
+                    android:textColor="#9A9A9A"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/free_pk_num"
+                    android:layout_width="70dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:text="-2"
+                    android:textColor="#FFFFFF"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/tmp_text1"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </LinearLayout>
+
+
+            <TextView
+                android:id="@+id/tmp_text2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="10dp"
+                android:text="每日凌晨6点更新"
+                android:textColor="#9A9A9A"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:id="@+id/imageView6"
+                android:layout_width="14dp"
+                android:layout_height="14dp"
+                android:layout_marginEnd="4dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/tmp_text2"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@mipmap/icon_free_pk_waring" />
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/tmp_text2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:text="每日凌晨6点更新"
-            android:textColor="#9A9A9A"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
-            android:id="@+id/imageView6"
-            android:layout_width="14dp"
-            android:layout_height="14dp"
-            android:layout_marginEnd="4dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/tmp_text2"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@mipmap/icon_free_pk_waring" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file