接入Popup2进行UI调整

common/src/main/res/drawable/bg_gift_progressbar2.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--设置ProgressBar背景色-->
+    <item android:id="@android:id/background">
+        <shape>
+            <!--设置ProgressBar进度条圆角半径-->
+            <corners android:radius="1dp" />
+            <solid android:color="#15FFFFFF" />
+        </shape>
+    </item>
+
+    <!--设置ProgressBar进度条颜色-->
+    <item android:id="@android:id/progress">
+        <scale android:scaleWidth="100%">
+            <shape>
+                <corners android:radius="1dp" />
+                <gradient
+                    android:endColor="#DED9A5"
+                    android:startColor="#DED9A5" />
+            </shape>
+        </scale>
+    </item>
+</layer-list>

common/src/main/res/layout/dialog_live_gift_popup2.xml

@@ -18,7 +18,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/openVipBg"
-        tools:background="@drawable/bg_gift_bottom_bg" />
+        android:background="@drawable/bg_gift_bottom_bg" />
     <!--底部送礼选择数量备份 -->
     <View
         android:id="@+id/giftSendBgV"
@@ -28,7 +28,7 @@
         android:layout_marginBottom="16dp"
         android:background="@drawable/bg_gift_send"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="3.74"
+        app:layout_constraintDimensionRatio="4"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintWidth_percent="0.34" />
 
@@ -42,7 +42,7 @@
         android:textColor="@color/black1"
         android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="@+id/giftSendBgV"
-        app:layout_constraintDimensionRatio="1.82"
+        app:layout_constraintDimensionRatio="2"
         app:layout_constraintEnd_toEndOf="@+id/giftSendBgV"
         app:layout_constraintTop_toTopOf="@+id/giftSendBgV" />
 
@@ -217,7 +217,7 @@
         android:textColor="@color/white"
         android:textSize="12sp"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/giftTitleRecyclerView"
+        app:layout_constraintBottom_toTopOf="@+id/giftWrapTv"
         app:layout_constraintStart_toStartOf="parent"
         tools:text="LV.8" />
 
@@ -259,7 +259,7 @@
         android:layout_marginStart="1dp"
         android:layout_marginTop="2dp"
         android:layout_marginEnd="10dp"
-        android:progressDrawable="@drawable/bg_gift_progressbar"
+        android:progressDrawable="@drawable/bg_gift_progressbar2"
         app:layout_constraintStart_toStartOf="@+id/lvTipsTv"
         app:layout_constraintTop_toBottomOf="@+id/lvTipsTv"
         app:layout_constraintWidth_percent="0.54"
@@ -289,7 +289,7 @@
         android:id="@+id/openVipTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="14dp"
         android:text="@string/open_vip_live"
         android:textColor="@color/white"
         android:textSize="11sp"