From 94ec0d1d888773b75f443f6e39af4d18ef8841db Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Fri, 11 Oct 2024 17:51:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=92=AD=E5=B0=8F=E8=B4=B4=E5=A3=AB?=
 =?UTF-8?q?=E5=8F=AA=E9=9A=8F=E6=9C=BA=E5=8F=96=E4=B8=80=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../live/views/LiveNewReadySwViewHolder.java  | 25 +++++++++++++++++--
 .../main/res/layout/view_new_live_ready.xml   | 15 ++++++++---
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java
index 6d58671c4..985a39f67 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java
@@ -343,7 +343,13 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
                     }
                     Log.i("LiveOpenTipsBean",data.toString());
                     findViewById(R.id.tips).setVisibility(View.VISIBLE);
-                    for (int i = 0; i < data.size(); i++) {
+                    int i = -1;
+                    if (data.size() == 1){
+                        i=0;
+                    }else if (data.size() >1){
+                        i= (int) (Math.random()*data.size());
+                    }
+                    if(i>-1){
                         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DpUtil.dp2px(16), DpUtil.dp2px(16));
                         LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
                         textParams.leftMargin = DpUtil.dp2px(5);
@@ -356,7 +362,22 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
                         week.setText(WordUtil.isNewZh() ? data.get(i).getContent() : data.get(i).getEnglish_content());
                         liveOpenVf.addView(weekView);
                     }
-                    liveOpenVf.startFlipping();
+//
+//
+//                    for (int i = 0; i < data.size(); i++) {
+//                        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DpUtil.dp2px(16), DpUtil.dp2px(16));
+//                        LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+//                        textParams.leftMargin = DpUtil.dp2px(5);
+//                        textParams.rightMargin = DpUtil.dp2px(5);
+//                        params.leftMargin = DpUtil.dp2px(5);
+//                        View weekView = LayoutInflater.from(mContext).inflate(R.layout.view_live_open_tips, null);
+//                        TextView week = weekView.findViewById(R.id.wish_index);
+//                        week.setLayoutParams(textParams);
+//                        week.setGravity(Gravity.CENTER_VERTICAL);
+//                        week.setText(WordUtil.isNewZh() ? data.get(i).getContent() : data.get(i).getEnglish_content());
+//                        liveOpenVf.addView(weekView);
+//                    }
+//                    liveOpenVf.startFlipping();
                 }else {
                      findViewById(R.id.tips).setVisibility(View.GONE);
                 }
diff --git a/live/src/main/res/layout/view_new_live_ready.xml b/live/src/main/res/layout/view_new_live_ready.xml
index 131c49018..c4d75fa0f 100644
--- a/live/src/main/res/layout/view_new_live_ready.xml
+++ b/live/src/main/res/layout/view_new_live_ready.xml
@@ -95,17 +95,24 @@
 
             <TextView
                 android:id="@+id/cover_text"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="4dp"
-                android:layout_marginStart="7dp"
-                android:layout_marginEnd="7dp"
+                android:layout_marginStart="3dp"
+                android:layout_marginEnd="3dp"
                 android:text="@string/live_cover_2"
                 android:paddingStart="1dp"
                 android:paddingEnd="1dp"
                 android:textColor="#FFFFFF"
-                android:singleLine="true"
+                android:gravity="center"
+                android:lines="1"
+                android:paddingTop="1dp"
+                android:paddingBottom="1dp"
                 android:background="@drawable/bg_chang_live_cover"
+                app:autoSizeMaxTextSize="10sp"
+                app:autoSizeMinTextSize="8sp"
+                app:autoSizeStepGranularity="1sp"
+                app:autoSizeTextType="uniform"
                 android:textSize="10sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"