From 045a8708e0fbbf97f64d6fba7a05fbbb1e0a2aa7 Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Fri, 11 Oct 2024 14:50:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E5=BA=A6=E5=8A=A0=E6=88=90=E5=92=8C?=
 =?UTF-8?q?=E5=B0=8F=E6=97=B6=E6=A6=9C=E5=9B=BE=E6=A0=87=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/live/views/LiveRoomViewHolder.java | 21 ++++++++++---------
 live/src/main/res/layout/view_wish_list2.xml  |  7 +++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index 0516048ba..27744c551 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -3570,15 +3570,15 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         ImageView hourPic = hourView.findViewById(R.id.wish_pic);
         mHotText = hotView.findViewById(R.id.wish_index);
         mHourRank = hourView.findViewById(R.id.wish_index);
-        mHotText.setText("熱度加成");
-        mHourRank.setText("0");
+        mHotText.setText("0");
+        mHourRank.setText(mHourRank.getContext().getString(R.string.heat_add));
 //        mHotText.setLayoutParams(textParams);
 //        mHourRank.setLayoutParams(textParams);
-        mHotText.setGravity(Gravity.CENTER);
-        mHourRank.setGravity(Gravity.CENTER);
+//        mHotText.setGravity(Gravity.CENTER);
+//        mHourRank.setGravity(Gravity.CENTER);
         setHourRankData(Long.parseLong(model.getRank()));
-        hotPic.setImageResource(R.mipmap.ic_live_hour_rank);
-        hourPic.setImageResource(R.mipmap.ic_live_hot_rank);
+        hotPic.setImageResource(R.mipmap.ic_live_hot_rank);
+        hourPic.setImageResource(R.mipmap.ic_live_hour_rank);
 //        hotPic.setLayoutParams(params);
 //        hourPic.setLayoutParams(params);
         flipper.addView(hotView);
@@ -3626,13 +3626,14 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 mHotText = hotView.findViewById(R.id.wish_index);
                 mHourRank = hourView.findViewById(R.id.wish_index);
                 mHotText.setText("0");
+                mHourRank.setText(mHourRank.getContext().getString(R.string.heat_add));
 //                mHotText.setLayoutParams(textParams);
 //                mHourRank.setLayoutParams(textParams);
-                mHotText.setGravity(Gravity.CENTER);
-                mHourRank.setGravity(Gravity.CENTER);
+//                mHotText.setGravity(Gravity.CENTER);
+//                mHourRank.setGravity(Gravity.CENTER);
                 setHourRankData(info.get(0).getRank());
-                hotPic.setImageResource(R.mipmap.ic_live_hour_rank);
-                hourPic.setImageResource(R.mipmap.ic_live_hot_rank);
+                hotPic.setImageResource(R.mipmap.ic_live_hot_rank);
+                hourPic.setImageResource(R.mipmap.ic_live_hour_rank);
 //                hotPic.setLayoutParams(params);
 //                hourPic.setLayoutParams(params);
                 flipper.addView(hotView);
diff --git a/live/src/main/res/layout/view_wish_list2.xml b/live/src/main/res/layout/view_wish_list2.xml
index f565648fa..5aee829a0 100644
--- a/live/src/main/res/layout/view_wish_list2.xml
+++ b/live/src/main/res/layout/view_wish_list2.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    tools:layout_width="70dp"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/transparent"
     tools:background="@drawable/bg_live_item"
-    tools:layout_height="23dp">
+    tools:layout_height="22.5dp">
 
     <ImageView
         android:id="@+id/wish_pic"
@@ -23,11 +24,9 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/wish_pic"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         tools:text="热度加成"
-        android:paddingBottom="1dp"
-        android:layout_marginStart="19dp"
         android:ellipsize="marquee"
         android:focusable="true"
         android:gravity="center"