From 846e7c810f01abf007efee8f242ac58c359d06f0 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Thu, 1 Sep 2022 10:40:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=20=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E9=96=93UI=E4=BF=AE=E6=94=B9,=E7=A4=BC=E7=89=A9?=
 =?UTF-8?q?=E6=8E=92=E9=98=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../live/activity/LiveAudienceActivity.java   |   7 +-
 .../res/layout/activity_live_audience.xml     |   2 +-
 live/src/main/res/layout/guard_list.xml       |  55 ++--
 .../main/res/layout/item_user_more_info.xml   | 242 +++++++++---------
 live/src/main/res/values/strings.xml          |   6 +-
 5 files changed, 153 insertions(+), 159 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
index 8f2fa86df..9c84145ca 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -665,12 +665,7 @@ public class LiveAudienceActivity extends LiveActivity {
                 liveFansFragment.show(getSupportFragmentManager(), "LiveGuardDialogFragment");
                 break;
             case GUARD:
-                LiveGuardDialogFragment liveGuardDialogFragment = new LiveGuardDialogFragment();
-                liveGuardDialogFragment.setLiveGuardInfo(mLiveGuardInfo);
-                bundle.putString(Constants.LIVE_UID, mLiveUid);
-                bundle.putBoolean(Constants.ANCHOR, mIsAnchor);
-                liveGuardDialogFragment.setArguments(bundle);
-                liveGuardDialogFragment.show(getSupportFragmentManager(), "LiveGuardDialogFragment");
+                openNewGuardListWindow();
                 break;
             case LIVE_WKS://周星榜
                 String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid="
diff --git a/live/src/main/res/layout/activity_live_audience.xml b/live/src/main/res/layout/activity_live_audience.xml
index 3c77a5a7f..dbdb835bb 100644
--- a/live/src/main/res/layout/activity_live_audience.xml
+++ b/live/src/main/res/layout/activity_live_audience.xml
@@ -21,7 +21,7 @@
             android:id="@+id/mask"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="#70000000" />
+            android:background="#80000000" />
 
         <FrameLayout
             android:id="@+id/play_container"
diff --git a/live/src/main/res/layout/guard_list.xml b/live/src/main/res/layout/guard_list.xml
index f6de03725..88a7a25b1 100644
--- a/live/src/main/res/layout/guard_list.xml
+++ b/live/src/main/res/layout/guard_list.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="80dp"
     android:orientation="vertical">
 
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -19,8 +17,7 @@
             android:layout_width="40dp"
             android:layout_height="30dp"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            />
+            android:layout_marginLeft="10dp" />
 
         <com.makeramen.roundedimageview.RoundedImageView
             android:id="@+id/avatar"
@@ -30,8 +27,7 @@
             android:layout_marginLeft="8dp"
             android:layout_marginRight="12dp"
             android:scaleType="centerCrop"
-            app:riv_oval="true"
-            />
+            app:riv_oval="true" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -39,7 +35,6 @@
             android:orientation="vertical">
 
 
-
             <TextView
                 android:id="@+id/name"
                 android:layout_width="wrap_content"
@@ -49,27 +44,25 @@
                 android:maxWidth="100dp"
                 android:singleLine="true"
                 android:textColor="#3F3F3F"
-                android:textSize="15sp"
-                />
+                android:textSize="15sp" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
-            <ImageView
-                android:id="@+id/sex"
-                android:layout_width="18dp"
-                android:layout_height="15dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginTop="5dp"
-                />
 
-            <ImageView
-                android:id="@+id/level"
-                android:layout_width="30dp"
-                android:layout_height="15dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginTop="5dp"/>
+                <ImageView
+                    android:id="@+id/sex"
+                    android:layout_width="18dp"
+                    android:layout_height="15dp"
+                    android:layout_marginTop="5dp" />
+
+                <ImageView
+                    android:id="@+id/level"
+                    android:layout_width="30dp"
+                    android:layout_height="15dp"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginTop="5dp" />
 
             </LinearLayout>
 
@@ -81,38 +74,38 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="right">
+
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
-                android:layout_marginEnd="20dp"
                 android:layout_marginTop="4dp"
+                android:layout_marginEnd="20dp"
+                android:layout_marginBottom="5dp"
                 android:orientation="vertical">
 
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="right"
                     android:layout_marginRight="3dp"
                     android:text="貢獻度"
-                    android:layout_gravity="right"
                     android:textColor="#ffb1b1b1"
-                    android:textSize="12sp"/>
+                    android:textSize="12sp" />
 
                 <TextView
                     android:id="@+id/votes"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="1"
-                    android:textColor="#979797"
                     android:layout_gravity="right"
                     android:gravity="center"
-                    android:textSize="12sp"/>
+                    android:text="1"
+                    android:textColor="#979797"
+                    android:textSize="12sp" />
 
             </LinearLayout>
 
 
-
         </LinearLayout>
     </LinearLayout>
 
diff --git a/live/src/main/res/layout/item_user_more_info.xml b/live/src/main/res/layout/item_user_more_info.xml
index e52be8494..67b3c35e6 100644
--- a/live/src/main/res/layout/item_user_more_info.xml
+++ b/live/src/main/res/layout/item_user_more_info.xml
@@ -6,173 +6,179 @@
     android:gravity="center_vertical"
     android:orientation="vertical">
 
-    <TextView android:id="@+id/title1"
+    <TextView
+        android:id="@+id/title1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="13sp"
-        android:text="觀眾"
-        android:textColor="#B1B1B1"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="15dp"
-        android:visibility="gone"/>
-
-    <TextView android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="13sp"
         android:text="觀眾"
         android:textColor="#B1B1B1"
+        android:textSize="13sp"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="5dp"
-        android:visibility="gone"/>
+        android:text="觀眾"
+        android:textColor="#B1B1B1"
+        android:textSize="13sp"
+        android:visibility="gone" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="70dp"
         android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="69dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
         <LinearLayout
-            android:id="@+id/ranks"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:gravity="center"
-            android:layout_gravity="center"
-            android:visibility="gone"
-            android:layout_marginLeft="16dp"
-            android:orientation="horizontal" />
+            android:layout_width="match_parent"
+            android:layout_height="69dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
-        <RelativeLayout
-            android:id="@+id/userIcon"
-            android:layout_width="65dp"
-            android:layout_height="65dp"
-            android:layout_marginLeft="27dp"
-            android:gravity="center">
+            <LinearLayout
+                android:id="@+id/ranks"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center"
+                android:layout_marginLeft="16dp"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:visibility="gone" />
 
-            <com.makeramen.roundedimageview.RoundedImageView
-                android:id="@+id/avatar"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_centerInParent="true"
-                android:layout_centerVertical="true"
-                android:scaleType="centerCrop"
-                android:src="@drawable/m_chu_xia"
-                app:riv_oval="true"/>
-
-            <com.opensource.svgaplayer.SVGAImageView
-                android:id="@+id/gift_svga"
+            <RelativeLayout
+                android:id="@+id/userIcon"
                 android:layout_width="65dp"
                 android:layout_height="65dp"
-                android:layout_centerVertical="true"
-                android:layout_centerHorizontal="true"
-                android:layout_centerInParent="true"
-                android:scaleType="centerCrop"
-                app:autoPlay="true"/>
+                android:layout_marginLeft="27dp"
+                android:gravity="center">
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:id="@+id/avatar"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_centerInParent="true"
+                    android:layout_centerVertical="true"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/m_chu_xia"
+                    app:riv_oval="true" />
+
+                <com.opensource.svgaplayer.SVGAImageView
+                    android:id="@+id/gift_svga"
+                    android:layout_width="65dp"
+                    android:layout_height="65dp"
+                    android:layout_centerInParent="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:scaleType="centerCrop"
+                    app:autoPlay="true" />
 
 
-        </RelativeLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:orientation="vertical">
-
+            </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
-            <TextView
-                android:id="@+id/name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="用户名称"
-                android:textColor="#F6F7FB"
-                android:textSize="14sp" />
+                android:layout_marginLeft="20dp"
+                android:orientation="vertical">
 
-                <ImageView
-                    android:id="@+id/noble"
-                    android:layout_width="20dp"
-                    android:layout_marginLeft="5dp"
-                    android:visibility="gone"
-                    android:layout_height="20dp" />
 
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="用户名称"
+                        android:textColor="#F6F7FB"
+                        android:textSize="14sp" />
+
+                    <ImageView
+                        android:id="@+id/noble"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_marginLeft="5dp"
+                        android:visibility="gone" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal">
+
+
+                    <ImageView
+                        android:id="@+id/sex"
+                        android:layout_width="18dp"
+                        android:layout_height="15dp" />
+
+                    <ImageView
+                        android:id="@+id/level"
+                        android:layout_width="30dp"
+                        android:layout_height="15dp"
+                        android:layout_marginLeft="5dp" />
+
+                </LinearLayout>
             </LinearLayout>
 
-            <LinearLayout
+            <RelativeLayout
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:orientation="horizontal">
-
+                android:layout_height="wrap_content">
 
                 <ImageView
-                    android:id="@+id/sex"
-                    android:layout_width="18dp"
-                    android:layout_height="15dp" />
+                    android:id="@+id/icon"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginLeft="25dp"
+                    android:layout_marginRight="35dp" />
 
-                <ImageView
-                    android:id="@+id/level"
-                    android:layout_width="30dp"
-                    android:layout_height="15dp"
-                    android:layout_marginLeft="5dp" />
+                <FrameLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="25dp"
+                    android:layout_marginRight="35dp">
 
-            </LinearLayout>
-        </LinearLayout>
+                    <ImageView
+                        android:id="@+id/ivIcon"
+                        android:layout_width="55dp"
+                        android:layout_height="12dp"
+                        android:layout_gravity="center" />
 
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
 
-        <ImageView
-            android:id="@+id/icon"
-            android:layout_alignParentRight="true"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginLeft="25dp"
-            android:layout_marginRight="35dp"/>
 
-            <FrameLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="25dp"
-                android:layout_marginRight="35dp">
+                </FrameLayout>
 
-                <ImageView
-                    android:id="@+id/ivIcon"
-                    android:layout_gravity="center"
-                    android:layout_width="55dp"
-                    android:layout_height="16dp"
-                    />
 
                 <TextView
                     android:id="@+id/tvName"
-                    android:layout_gravity="center"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="主播"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginEnd="20dp"
+                    android:layout_gravity="center"
                     android:paddingLeft="13dp"
+                    android:text="主播"
+                    android:layout_marginTop="25dp"
                     android:textColor="@color/white"
-                    android:textSize="10sp"/>
+                    android:textSize="10sp" />
+
+            </RelativeLayout>
 
 
-            </FrameLayout>
-
-
-        </RelativeLayout>
-
-
-    </LinearLayout>
+        </LinearLayout>
 
     </LinearLayout>
 
diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml
index e9cb69fef..6174a9171 100644
--- a/live/src/main/res/values/strings.xml
+++ b/live/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
     <string name="hour_rank_not">未上榜</string>
     <string name="day_rank">日榜</string>
     <string name="week_rank">周榜</string>
-    <string name="views_rank">观众</string>
-    <string name="gurad_rank">观众</string>
-    <string name="fans">粉丝</string>
+    <string name="views_rank">觀眾</string>
+    <string name="gurad_rank">觀眾</string>
+    <string name="fans">粉絲</string>
 </resources>