From 8bd3a32c5e6972b1a887c5982b753339cd6aa4b7 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Wed, 31 Aug 2022 13:51:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DAndroid9=E4=B8=8B?=
 =?UTF-8?q?=E8=A7=82=E4=BC=97=E5=88=97=E8=A1=A8=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20fix:=E4=BF=AE=E5=A4=8D=E5=AE=88=E6=8A=A4?=
 =?UTF-8?q?=E6=9D=83=E7=9B=8A=E5=88=97=E8=A1=A8=E6=95=B0=E7=BB=84=E4=B8=8B?=
 =?UTF-8?q?=E6=A0=87=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=20update:?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=9C=80=E6=B1=82=E8=B0=83=E6=95=B4=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E5=AE=88=E6=8A=A4=20update:=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=B3=E7=A7=BB=E4=B8=80=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dialog/LiveNewGuardBuyDialogFragment.java |  6 ++-
 .../yunbao/live/views/LiveRoomViewHolder.java |  7 +---
 .../main/res/drawable/bg_guard_btn_buy.xml    | 14 ++-----
 .../main/res/layout/dialog_new_guard_buy.xml  |  3 +-
 live/src/main/res/layout/item_live_user.xml   | 38 +++++++++----------
 live/src/main/res/layout/view_live_room.xml   | 16 +++++---
 6 files changed, 38 insertions(+), 46 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveNewGuardBuyDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveNewGuardBuyDialogFragment.java
index 39161f02e..0529ccb11 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveNewGuardBuyDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveNewGuardBuyDialogFragment.java
@@ -239,10 +239,12 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
                 bean.setChecked(false);
             }
             for (int i : guardBuyBean.getPrivilege()) {
-                mRightList.get(i).setChecked(true);
+                if(i<mRightList.size()) {
+                    mRightList.get(i).setChecked(true);
+                }
             }
             mGuardRightAdapter.notifyDataSetChanged();
-            mBtnBuy.setEnabled(mCoinVal >= guardBuyBean.getCoin());
+        //    mBtnBuy.setEnabled(mCoinVal >= guardBuyBean.getCoin());
         }
 
     }
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 b94c6972d..7386bc10e 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -783,11 +783,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                     if (mLiveUserAdapter != null) {
                         JSONObject obj = JSON.parseObject(info[0]);
                         List<LiveUserGiftBean> list = JSON.parseArray(obj.getString("userlist"), LiveUserGiftBean.class);
-                        if(list.size()>3){
-                            ViewGroup.LayoutParams layoutParams = mUserRecyclerView.getLayoutParams();
-                            layoutParams.height=DpUtil.dp2px(100);
-                            mUserRecyclerView.setLayoutParams(layoutParams);
-                        }
                         mLiveUserAdapter.refreshList(list);
                     }
                 }
@@ -1464,7 +1459,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
      */
     public void setUserList(List<LiveUserGiftBean> list) {
         if (mLiveUserAdapter != null) {
-            resetUserListWidth(DpUtil.dp2px((Math.min(list.size(), 3)) * 38));
+            //resetUserListWidth(DpUtil.dp2px((Math.min(list.size(), 3)) * 30));
             mLiveUserAdapter.refreshList(list);
         }
     }
diff --git a/live/src/main/res/drawable/bg_guard_btn_buy.xml b/live/src/main/res/drawable/bg_guard_btn_buy.xml
index 16efaee29..e1e59a76e 100644
--- a/live/src/main/res/drawable/bg_guard_btn_buy.xml
+++ b/live/src/main/res/drawable/bg_guard_btn_buy.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true">
-        <shape>
-            <corners android:radius="15dp"/>
-            <gradient android:endColor="#FF7D2F" android:startColor="#FF5623" android:type="linear"/>
-        </shape>
-    </item>
-    <item android:state_enabled="false">
-        <shape>
-            <corners android:radius="15dp"/>
-            <solid android:color="@color/gray3"/>
+    <item android:width="102dp" android:height="34dp">
+        <shape android:shape="rectangle">
+            <gradient android:type="linear" android:useLevel="true" android:startColor="#ffa98cfd" android:endColor="#ff9d7afd" android:angle="90" />
+            <corners android:radius="21dp" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/live/src/main/res/layout/dialog_new_guard_buy.xml b/live/src/main/res/layout/dialog_new_guard_buy.xml
index 6cbf011f6..444b8e434 100644
--- a/live/src/main/res/layout/dialog_new_guard_buy.xml
+++ b/live/src/main/res/layout/dialog_new_guard_buy.xml
@@ -132,7 +132,7 @@
                 android:layout_marginTop="25dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                tools:visibility="gone">
+                tools:visibility="visible">
 
 
                 <TextView
@@ -164,7 +164,6 @@
                     android:layout_centerVertical="true"
                     android:layout_marginEnd="15dp"
                     android:background="@drawable/bg_guard_btn_buy"
-                    android:enabled="false"
                     android:gravity="center"
                     android:text="@string/guard_buy"
                     android:textColor="@color/white"
diff --git a/live/src/main/res/layout/item_live_user.xml b/live/src/main/res/layout/item_live_user.xml
index 72108b54c..dc0ef1fae 100644
--- a/live/src/main/res/layout/item_live_user.xml
+++ b/live/src/main/res/layout/item_live_user.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="38dp"
-    android:layout_height="wrap_content"
-    >
+    android:layout_height="38dp">
 
-<!--    <ImageView-->
-<!--        android:id="@+id/wrap"-->
-<!--        android:layout_width="32dp"-->
-<!--        android:layout_height="44dp"-->
-<!--        android:layout_alignParentBottom="true"-->
-<!--        android:scaleType="fitXY"-->
-<!--        android:layout_marginBottom="1dp"-->
-<!--        android:src="@mipmap/icon_live_user_list_1"/>-->
+    <!--    <ImageView-->
+    <!--        android:id="@+id/wrap"-->
+    <!--        android:layout_width="32dp"-->
+    <!--        android:layout_height="44dp"-->
+    <!--        android:layout_alignParentBottom="true"-->
+    <!--        android:scaleType="fitXY"-->
+    <!--        android:layout_marginBottom="1dp"-->
+    <!--        android:src="@mipmap/icon_live_user_list_1"/>-->
 
     <RelativeLayout
         android:layout_width="38dp"
@@ -25,19 +23,19 @@
             android:id="@+id/avatar"
             android:layout_width="27dp"
             android:layout_height="27dp"
-            android:layout_centerVertical="true"
             android:layout_centerInParent="true"
             android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
             android:scaleType="centerCrop"
-            app:riv_oval="true"
-            android:src="@drawable/m_chu_xia"/>
+            android:src="@drawable/m_chu_xia"
+            app:riv_oval="true" />
 
 
         <com.opensource.svgaplayer.SVGAImageView
             android:id="@+id/gift_svga"
             android:layout_width="38dp"
             android:layout_height="38dp"
-            app:autoPlay="true"/>
+            app:autoPlay="true" />
 
     </RelativeLayout>
 
@@ -46,15 +44,15 @@
         android:id="@+id/icon"
         android:layout_width="16dp"
         android:layout_height="16dp"
-        android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:visibility="gone"/>
+        android:layout_alignParentBottom="true"
+        android:visibility="gone" />
 
     <ImageView
         android:id="@+id/guard_icon"
         android:layout_width="17dp"
         android:layout_height="17dp"
-        android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:visibility="gone"/>
+        android:layout_alignParentBottom="true"
+        android:visibility="gone" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 1f64e966d..6a6fd9045 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -181,8 +181,9 @@
             android:layout_toRightOf="@id/group_1">
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:gravity="end|center"
                 android:layout_alignParentRight="true"
                 android:orientation="horizontal">
 
@@ -215,7 +216,8 @@
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/user_recyclerView"
-                    android:layout_width="wrap_content"
+                    android:layout_width="80dp"
+                    android:layout_gravity="end|center"
                     android:layout_height="40dp"
                     android:layout_marginRight="-3dp"
                     android:overScrollMode="never" />
@@ -223,16 +225,17 @@
                 <ImageView
                     android:id="@+id/user_more"
                     android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_marginTop="4dp"
+                    android:layout_gravity="center"
+                    android:layout_height="40dp"
                     android:src="@mipmap/live_users_more" />
 
                 <ImageView
                     android:id="@+id/btn_close"
                     android:layout_width="30dp"
-                    android:layout_height="30dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center"
                     android:layout_marginStart="6dp"
-                    android:layout_marginTop="4dp"
+                    android:layout_marginEnd="4dp"
                     android:scaleType="fitCenter"
                     android:src="@mipmap/icon_live_close_3" />
             </LinearLayout>
@@ -1861,6 +1864,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/room_fast_msg"
             android:layout_width="match_parent"
+            android:layout_marginStart="10dp"
             android:layout_height="30dp"
             android:layout_alignParentBottom="true"
             android:visibility="gone" />