From d5953bd6519f46808b6690b9f7feeaacdec8bc23 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Thu, 17 Aug 2023 13:19:04 +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

---
 .../src/main/res/layout/dialog_live_gift_popup.xml   | 12 ++++++------
 config.gradle                                        |  6 +++---
 live/src/main/res/layout/item_frame_gift.xml         |  4 ++--
 live/src/main/res/layout/item_live_parcel.xml        |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/src/main/res/layout/dialog_live_gift_popup.xml b/common/src/main/res/layout/dialog_live_gift_popup.xml
index 3f631f656..c289530fa 100644
--- a/common/src/main/res/layout/dialog_live_gift_popup.xml
+++ b/common/src/main/res/layout/dialog_live_gift_popup.xml
@@ -15,9 +15,9 @@
             android:id="@+id/operate_image"
             android:layout_width="122dp"
             android:layout_height="50dp"
+            android:layout_gravity="end|bottom"
             android:layout_marginEnd="5dp"
-            android:scaleType="fitXY"
-            android:layout_gravity="end|bottom" />
+            android:scaleType="fitXY" />
 
         <FrameLayout
             android:id="@+id/blind_box"
@@ -95,7 +95,7 @@
     <RelativeLayout
         android:id="@+id/gift_list"
         android:layout_width="match_parent"
-        android:layout_height="361dp"
+        android:layout_height="345dp"
         android:animateLayoutChanges="true"
         android:orientation="vertical">
 
@@ -358,8 +358,8 @@
                         android:id="@+id/gift_title"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_marginEnd="10dp"
-                        android:layout_marginStart="8dp" />
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="10dp" />
 
                     <ImageView
                         android:layout_width="27dp"
@@ -406,7 +406,7 @@
             <FrameLayout
                 android:id="@+id/context_layout_gift"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="196dp"
                 android:layout_marginTop="12dp" />
 
 
diff --git a/config.gradle b/config.gradle
index 9778093f9..a192301cc 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,7 +4,7 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
             targetSdkVersion : 31,
-            versionCode      : 442,
+            versionCode      : 443,
             versionName      : "6.5.4"
     ]
     manifestPlaceholders = [
@@ -21,10 +21,10 @@ ext {
             baiduAppKey      : "zgCgFhUKEOV7I3ZXDFpTfnRB",
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 //            true表示谷歌支付 false
-            isGooglePlay     :  false,
+            isGooglePlay     :  true,
             //是否上报异常日志
             isUploadLog      :  true,
             //是否打包成插件包模式
-            isPluginModel    :  true,
+            isPluginModel    :  false,
     ]
 }
diff --git a/live/src/main/res/layout/item_frame_gift.xml b/live/src/main/res/layout/item_frame_gift.xml
index b650e2808..e6495ce45 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="95dp"
+    android:layout_height="87dp"
     android:background="@drawable/background_gift_select"
     android:gravity="center"
     android:orientation="vertical">
@@ -66,7 +66,7 @@
         android:layout_height="match_parent"
         android:background="#C0000000"
         android:gravity="center"
-        android:visibility="visible">
+        android:visibility="gone">
 
         <ImageView
             android:id="@+id/gift_loading"
diff --git a/live/src/main/res/layout/item_live_parcel.xml b/live/src/main/res/layout/item_live_parcel.xml
index 46662180f..9caae1385 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="95dp"
+    android:layout_height="87dp"
     android:background="@drawable/background_gift_select"
     android:gravity="center"
     android:orientation="vertical">