From 12749a1183266b5b080b5107c0cdb9247885a993 Mon Sep 17 00:00:00 2001
From: Martin <13046765170@163.com>
Date: Wed, 14 Aug 2024 10:02:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=92=AD=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/drawable/backgroud_live_end_1.xml     |  3 -
 .../bg_live_end_user_level_progres.xml        |  6 +-
 .../yunbao/live/views/LiveEndViewHolder.java  |  8 +-
 live/src/main/res/layout/view_live_end.xml    | 78 +++++++++----------
 .../src/main/res/layout/view_live_end_hot.xml |  1 -
 5 files changed, 44 insertions(+), 52 deletions(-)

diff --git a/common/src/main/res/drawable/backgroud_live_end_1.xml b/common/src/main/res/drawable/backgroud_live_end_1.xml
index f1422092b..b68814931 100644
--- a/common/src/main/res/drawable/backgroud_live_end_1.xml
+++ b/common/src/main/res/drawable/backgroud_live_end_1.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="#40E4E4E4" />
-    <stroke
-        android:width="1dp"
-        android:color="#40E4E4E4" />
     <corners android:radius="21dp" />
 </shape>
\ No newline at end of file
diff --git a/common/src/main/res/drawable/bg_live_end_user_level_progres.xml b/common/src/main/res/drawable/bg_live_end_user_level_progres.xml
index 0da9c5976..2be6e2d06 100644
--- a/common/src/main/res/drawable/bg_live_end_user_level_progres.xml
+++ b/common/src/main/res/drawable/bg_live_end_user_level_progres.xml
@@ -5,7 +5,7 @@
         <shape>
             <!--设置ProgressBar进度条圆角半径-->
             <corners android:radius="3dp" />
-            <solid android:color="#FFFFFF" />
+            <solid android:color="#73FFFFFF" />
         </shape>
     </item>
 
@@ -15,8 +15,8 @@
             <shape>
                 <corners android:radius="3dp" />
                 <gradient
-                    android:endColor="#73FFFFFF"
-                    android:startColor="#73FFFFFF" />
+                    android:endColor="#FFFFFF"
+                    android:startColor="#FFFFFF" />
             </shape>
         </scale>
     </item>
diff --git a/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
index 7c5bdc010..5b510d164 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
@@ -307,7 +307,7 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
             @Override
             public void onClick(View v) {
                 String url = CommonAppConfig.HOST + "/h5/Grade/index.html?" + "token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&for";
-                ZhuangBanActivity.forward(mContext, url, 0);
+                WebViewActivity.forward(mContext, url,false);
             }
         });
         findViewById(R.id.go_anchor_center).setOnClickListener(new View.OnClickListener() {
@@ -382,8 +382,8 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
         } else {
             if (liveDurationAnchor != null) {
                 String timeStr = DateFormatUtil.getTimeLiveEndString(Long.parseLong(starttime))+
-                        "-"+DateFormatUtil.getTimeLiveEndString(Long.parseLong(endtime))
-                        +mContext.getResources().getString(R.string.live_end_total)+DateFormatUtil.getDiffInMilliseconds(starttime,endtime)+mContext.getResources().getString(R.string.live_end_minute);
+                        " - "+DateFormatUtil.getTimeLiveEndString(Long.parseLong(endtime))
+                        +" "+mContext.getResources().getString(R.string.live_end_total)+" "+DateFormatUtil.getDiffInMilliseconds(starttime,endtime)+" "+mContext.getResources().getString(R.string.live_end_minute);
                 liveDurationAnchor.setText(timeStr);
             }
             if (liveVotes != null) {
@@ -430,9 +430,7 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
                         level_progress.setProgress(Integer.parseInt(votestotal));
                     }
                 });
-
             }
-
         }
     }
 
diff --git a/live/src/main/res/layout/view_live_end.xml b/live/src/main/res/layout/view_live_end.xml
index d5ea84f08..c9552d839 100644
--- a/live/src/main/res/layout/view_live_end.xml
+++ b/live/src/main/res/layout/view_live_end.xml
@@ -9,10 +9,10 @@
 
     <ImageView
         android:id="@+id/avatar_1"
-        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
+        android:scaleType="centerCrop"
+        android:visibility="gone" />
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -397,12 +397,12 @@
                 <ImageView
                     android:id="@+id/close"
                     android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:layout_alignParentEnd="true"
                     android:layout_marginTop="70dp"
                     android:layout_marginEnd="16dp"
                     android:padding="2dp"
-                    android:src="@mipmap/icon_live_end_close"
-                    android:layout_height="20dp"/>
+                    android:src="@mipmap/icon_live_end_close" />
 
             </RelativeLayout>
 
@@ -646,8 +646,7 @@
                         android:layout_weight="1.8"
                         android:text="0"
                         android:textColor="@color/white"
-                        android:textSize="16sp"
-                        />
+                        android:textSize="16sp" />
 
                     <TextView
                         android:id="@+id/count2"
@@ -656,8 +655,7 @@
                         android:layout_weight="1.5"
                         android:text="0"
                         android:textColor="@color/white"
-                        android:textSize="16sp"
-                         />
+                        android:textSize="16sp" />
 
                     <TextView
                         android:id="@+id/count3"
@@ -667,8 +665,7 @@
                         android:layout_weight="1"
                         android:text="0"
                         android:textColor="@color/white"
-                        android:textSize="16sp"
-                         />
+                        android:textSize="16sp" />
 
                 </LinearLayout>
 
@@ -716,8 +713,7 @@
                         android:layout_weight="1.8"
                         android:text="0"
                         android:textColor="@color/white"
-                        android:textSize="16sp"
-                         />
+                        android:textSize="16sp" />
 
                     <TextView
                         android:id="@+id/count5"
@@ -726,8 +722,7 @@
                         android:layout_weight="1.5"
                         android:text="0"
                         android:textColor="@color/white"
-                        android:textSize="16sp"
-                         />
+                        android:textSize="16sp" />
 
                     <TextView
                         android:id="@+id/count6"
@@ -737,8 +732,7 @@
                         android:layout_weight="1"
                         android:text="0"
                         android:textColor="@color/white"
-                        android:textSize="16sp"
-                         />
+                        android:textSize="16sp" />
 
                 </LinearLayout>
 
@@ -786,8 +780,7 @@
                         android:layout_weight="1.8"
                         android:text="0"
                         android:textColor="@color/white"
-                        android:textSize="16sp"
-                         />
+                        android:textSize="16sp" />
 
                     <TextView
                         android:id="@+id/count8"
@@ -796,8 +789,7 @@
                         android:layout_weight="1.5"
                         android:text="0"
                         android:textColor="@color/white"
-                        android:textSize="16sp"
-                         />
+                        android:textSize="16sp" />
 
                     <TextView
                         android:layout_width="0dp"
@@ -846,36 +838,29 @@
 
             </LinearLayout>
 
-            <LinearLayout
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="37dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="10dp"
                 android:layout_marginEnd="16dp"
                 android:background="@drawable/background_anchor_live_end"
-                android:gravity="center"
                 android:orientation="horizontal">
 
                 <ImageView
-                    android:src="@mipmap/icon_live_end_tips"
-                    android:layout_marginLeft="10dp"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-                <ViewFlipper
-                    android:id="@+id/live_end_vf"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="5dp"
-                    android:flipInterval="5000"
-                    android:inAnimation="@anim/anim_marquee_in"
-                    android:outAnimation="@anim/anim_marquee_out" />
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="10dp"
+                    android:src="@mipmap/icon_live_end_tips" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="23dp"
                     android:text="@string/live_end_strategy"
                     android:textColor="#CCCCCC"
                     android:textSize="14sp" />
@@ -883,10 +868,23 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true"
                     android:layout_gravity="center"
                     android:layout_marginEnd="10dp"
                     android:src="@mipmap/right_live_end" />
-            </LinearLayout>
+
+                <ViewFlipper
+                    android:id="@+id/live_end_vf"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_centerVertical="true"
+                    android:layout_marginStart="35dp"
+                    android:flipInterval="5000"
+                    android:inAnimation="@anim/anim_marquee_in"
+                    android:outAnimation="@anim/anim_marquee_out" />
+
+            </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -910,14 +908,14 @@
                 <TextView
                     android:id="@+id/go_home_anchor"
                     android:layout_width="wrap_content"
-                    android:minWidth="115dp"
                     android:layout_height="40dp"
-                    android:paddingStart="10dp"
-                    android:paddingEnd="10dp"
                     android:layout_gravity="center"
                     android:layout_marginLeft="37dp"
                     android:background="@drawable/backgroud_live_end_1"
                     android:gravity="center"
+                    android:minWidth="115dp"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="10dp"
                     android:text="@string/live_back"
                     android:textColor="#E9E9E9"
                     android:textSize="16sp" />
diff --git a/live/src/main/res/layout/view_live_end_hot.xml b/live/src/main/res/layout/view_live_end_hot.xml
index c76900395..7ea985b7a 100644
--- a/live/src/main/res/layout/view_live_end_hot.xml
+++ b/live/src/main/res/layout/view_live_end_hot.xml
@@ -9,7 +9,6 @@
         android:id="@+id/wish_index"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="2dp"
         android:ellipsize="marquee"
         android:focusable="true"
         android:gravity="center"