From e0861ff7eb541ef3e84f0713403f00f158e6d8e6 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Sat, 22 Oct 2022 17:42:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=9F=E7=BA=A7=E6=8C=91=E6=88=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E8=81=8A=E5=A4=A9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/live/adapter/LiveChatAdapter.java  |  4 +-
 live/src/main/res/layout/item_live_chat.xml   |  2 +-
 live/src/main/res/layout/view_live_room.xml   |  8 +--
 live/src/main/res/layout/view_start_level.xml | 67 ++++++++++++-------
 4 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
index 680ad7734..dc6f694ff 100644
--- a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
+++ b/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
@@ -171,13 +171,13 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
         void setData(final LiveChatBean bean, int position) {
 
             itemView.setTag(bean);
-            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
             params.setMargins(0, 0, DpUtil.dp2px(95), 12);
             mBg.setLayoutParams(params);
             if (bean.getType() == 6) {//大作战活动
                 view_action_game.setVisibility(View.VISIBLE);
                 bean.setHeart(position);
-                params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+                params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
                 params.setMargins(0, 0, 80, 12);
                 mBg.setLayoutParams(params);
 
diff --git a/live/src/main/res/layout/item_live_chat.xml b/live/src/main/res/layout/item_live_chat.xml
index b2fe56b56..282485a10 100644
--- a/live/src/main/res/layout/item_live_chat.xml
+++ b/live/src/main/res/layout/item_live_chat.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/bg"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginBottom="6dp"
     android:orientation="vertical">
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 20d75966c..b5e2d8c67 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -2100,8 +2100,8 @@
 
         <LinearLayout
             android:id="@+id/btn_event2"
-            android:layout_width="70dp"
-            android:layout_height="93dp"
+            android:layout_width="78dp"
+            android:layout_height="106dp"
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:layout_gravity="right"
@@ -2113,8 +2113,8 @@
 
             <com.ms.banner.Banner
                 android:id="@+id/banner2"
-                android:layout_width="70dp"
-                android:layout_height="93dp"
+                android:layout_width="78dp"
+                android:layout_height="106dp"
                 android:layout_marginBottom="5dp"
                 app:delay_time="5000"
                 app:indicator_height="8dp"
diff --git a/live/src/main/res/layout/view_start_level.xml b/live/src/main/res/layout/view_start_level.xml
index 0edc13017..65d8c8ef5 100644
--- a/live/src/main/res/layout/view_start_level.xml
+++ b/live/src/main/res/layout/view_start_level.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="70dp"
-    android:layout_height="93dp">
+    android:layout_width="78dp"
+    android:layout_height="106dp">
 
     <ImageView
         android:id="@+id/banner_back"
@@ -21,8 +21,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="18.33dp"
+            android:layout_marginTop="23dp"
             android:text="星级挑战"
+            android:textStyle="bold"
             android:textColor="#C53F4E"
             android:textSize="7sp" />
 
@@ -30,15 +31,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
-            android:layout_marginTop="33dp"
+            android:layout_marginTop="40dp"
             android:layout_marginEnd="5.67dp"
             android:gravity="center_vertical">
 
-            <ImageView
-                android:id="@+id/icon_start"
-                android:layout_width="13.33dp"
-                android:layout_height="13.33dp"
-                android:src="@mipmap/icon_start" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -46,13 +42,26 @@
                 android:layout_marginStart="3.33dp"
                 android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/total_star_value"
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/total_star_value"
-                    android:textColor="#C53F4E"
-                    android:textSize="6.5sp" />
+                    android:gravity="bottom">
+
+                    <ImageView
+                        android:id="@+id/icon_start"
+                        android:layout_width="12dp"
+                        android:layout_height="12dp"
+                        android:src="@mipmap/icon_start" />
+
+                    <TextView
+                        android:id="@+id/total_star_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/total_star_value"
+                        android:textColor="#C53F4E"
+                        android:textSize="7.97sp" />
+                </LinearLayout>
+
 
                 <com.yunbao.common.views.weight.ProgressView
                     android:id="@+id/total_star_progress"
@@ -89,15 +98,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
-            android:layout_marginTop="58dp"
+            android:layout_marginTop="70dp"
             android:layout_marginEnd="5.67dp"
             android:gravity="center_vertical">
 
-            <ImageView
-                android:id="@+id/icon_start_number"
-                android:layout_width="13.33dp"
-                android:layout_height="13.33dp"
-                android:src="@mipmap/icon_start_number" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -105,13 +109,26 @@
                 android:layout_marginStart="3.33dp"
                 android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/number_of_people_assisted"
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/number_of_people_assisted"
-                    android:textColor="#C53F4E"
-                    android:textSize="6.5sp" />
+                    android:gravity="bottom">
+
+                    <ImageView
+                        android:id="@+id/icon_start_number"
+                        android:layout_width="12dp"
+                        android:layout_height="12dp"
+                        android:src="@mipmap/icon_start_number" />
+
+                    <TextView
+                        android:id="@+id/number_of_people_assisted"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/number_of_people_assisted"
+                        android:textColor="#C53F4E"
+                        android:textSize="7.97sp" />
+                </LinearLayout>
+
 
                 <com.yunbao.common.views.weight.ProgressView
                     android:id="@+id/assist_progress"