From 17a2f5e091061b83cd18cae3acd2e88511f1a674 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 16 Aug 2023 20:01:46 +0800
Subject: [PATCH] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.gradle                                 |  6 ++--
 .../live/views/FrameGiftViewHolder.java       | 28 +++++++++----------
 .../live/views/LiveParcelItemViewHolder.java  | 16 +++++------
 .../res/layout/fragment_live_gift_item.xml    |  1 +
 live/src/main/res/layout/item_frame_gift.xml  | 10 +++----
 live/src/main/res/layout/item_live_parcel.xml |  6 ++--
 6 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/config.gradle b/config.gradle
index 9c9604d4b..9778093f9 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,14 +4,14 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
             targetSdkVersion : 31,
-            versionCode      : 441,
+            versionCode      : 442,
             versionName      : "6.5.4"
     ]
     manifestPlaceholders = [
             //正式、
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
 //            测试
-            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",
 
 
 
diff --git a/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java b/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java
index e67b1baef..1c205691e 100644
--- a/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java
@@ -63,20 +63,20 @@ public class FrameGiftViewHolder extends RecyclerView.ViewHolder {
     public void showData(int contextLayoutGiftHeight, LiveGiftBean model) {
 
         //设置高度
-        itemView.post(new Runnable() {
-            @Override
-            public void run() {
-                GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams();
-                int giftHeight = 607;
-                if (contextLayoutGiftHeight > 607) {
-                    giftHeight = 607;
-                } else {
-                    giftHeight = contextLayoutGiftHeight;
-                }
-                linearParams.height = (giftHeight - 30) / 2;
-                itemView.setLayoutParams(linearParams);
-            }
-        });
+//        itemView.post(new Runnable() {
+//            @Override
+//            public void run() {
+//                GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams();
+//                int giftHeight = 607;
+//                if (contextLayoutGiftHeight > 607) {
+//                    giftHeight = 607;
+//                } else {
+//                    giftHeight = contextLayoutGiftHeight;
+//                }
+//                linearParams.height = (giftHeight - 30) / 2;
+////                itemView.setLayoutParams(linearParams);
+//            }
+//        });
         giftLayout.setSelected(model.isChecked());
         if (model.isChecked()) {
             giftIcon.startAnimation(mAnimation);
diff --git a/live/src/main/java/com/yunbao/live/views/LiveParcelItemViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveParcelItemViewHolder.java
index 97db3a9ea..0f289c78d 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveParcelItemViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveParcelItemViewHolder.java
@@ -62,14 +62,14 @@ public class LiveParcelItemViewHolder extends RecyclerView.ViewHolder {
 
     public void showData(int contextLayoutGiftHeight, LiveGiftBean model) {
         //设置高度
-        itemView.post(new Runnable() {
-            @Override
-            public void run() {
-                GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams();
-                linearParams.height = contextLayoutGiftHeight / 2;
-                itemView.setLayoutParams(linearParams);
-            }
-        });
+//        itemView.post(new Runnable() {
+//            @Override
+//            public void run() {
+//                GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams();
+//                linearParams.height = contextLayoutGiftHeight / 2;
+////                itemView.setLayoutParams(linearParams);
+//            }
+//        });
         giftLayout.setSelected(model.isChecked());
         if (model.isChecked()) {
             giftIcon.startAnimation(mAnimation);
diff --git a/live/src/main/res/layout/fragment_live_gift_item.xml b/live/src/main/res/layout/fragment_live_gift_item.xml
index d2fae8429..56018b419 100644
--- a/live/src/main/res/layout/fragment_live_gift_item.xml
+++ b/live/src/main/res/layout/fragment_live_gift_item.xml
@@ -7,6 +7,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/frame_gift_list"
         android:layout_width="match_parent"
+        android:layout_gravity="bottom"
         android:overScrollMode="never"
         android:layout_height="match_parent" />
 
diff --git a/live/src/main/res/layout/item_frame_gift.xml b/live/src/main/res/layout/item_frame_gift.xml
index b43e18e44..b650e2808 100644
--- a/live/src/main/res/layout/item_frame_gift.xml
+++ b/live/src/main/res/layout/item_frame_gift.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/gift_layout"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="95dp"
     android:background="@drawable/background_gift_select"
     android:gravity="center"
     android:orientation="vertical">
@@ -20,8 +20,8 @@
 
             <ImageView
                 android:id="@+id/gift_icon"
-                android:layout_width="55dp"
-                android:layout_height="55dp" />
+                android:layout_width="50dp"
+                android:layout_height="50dp" />
 
 
             <TextView
@@ -30,7 +30,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="1dp"
                 android:textColor="@color/white"
-                android:textSize="11sp" />
+                android:textSize="10sp" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -48,7 +48,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/white"
-                    android:textSize="10sp" />
+                    android:textSize="9sp" />
             </LinearLayout>
         </LinearLayout>
 
diff --git a/live/src/main/res/layout/item_live_parcel.xml b/live/src/main/res/layout/item_live_parcel.xml
index 69e853d96..46662180f 100644
--- a/live/src/main/res/layout/item_live_parcel.xml
+++ b/live/src/main/res/layout/item_live_parcel.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/gift_layout"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="95dp"
     android:background="@drawable/background_gift_select"
     android:gravity="center"
     android:orientation="vertical">
@@ -27,8 +27,8 @@
 
                     <ImageView
                         android:id="@+id/gift_icon"
-                        android:layout_width="55dp"
-                        android:layout_height="55dp" />
+                        android:layout_width="50dp"
+                        android:layout_height="50dp" />
 
                     <TextView
                         android:id="@+id/expire"