合并声网代码

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item>
+    <shape android:shape="rectangle">
+        <corners android:radius="7dp" />
+        <solid android:color="#fff1f1f1"/>
+    </shape>
+</item>
+</selector>

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

@@ -5,16 +5,19 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <ImageView
-        android:id="@+id/img"
+    <LinearLayout
+        android:id="@+id/content_layout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:scaleType="fitXY"
+        android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:adjustViewBounds="true"
         app:layout_constraintStart_toStartOf="parent"
-        app:srcCompat="@mipmap/background_gift_wall" />
+        app:srcCompat="@mipmap/background_gift_wall">
+
+
+    </LinearLayout>
+
 
     <ImageView
         android:id="@+id/close"
@@ -22,7 +25,7 @@
         android:layout_height="24dp"
         android:layout_marginEnd="14dp"
         android:layout_marginBottom="12dp"
-        app:layout_constraintBottom_toTopOf="@+id/img"
+        app:layout_constraintBottom_toTopOf="@+id/content_layout"
         app:layout_constraintEnd_toEndOf="parent"
         app:srcCompat="@mipmap/ic_open_ad_close" />
 

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

@@ -6,26 +6,28 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/img"
+    <LinearLayout
+        android:id="@+id/content_layout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
         android:layout_marginBottom="12dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toTopOf="@+id/close"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+    </LinearLayout>
+
 
     <ImageView
         android:id="@+id/close"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginBottom="202dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/img"
-        app:layout_constraintStart_toStartOf="@+id/img"
+        android:layout_marginTop="24dp"
+        app:layout_constraintEnd_toEndOf="@+id/content_layout"
+        app:layout_constraintStart_toStartOf="@+id/content_layout"
+        app:layout_constraintTop_toBottomOf="@+id/content_layout"
         app:srcCompat="@mipmap/ic_open_ad_close" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -25,6 +25,12 @@
                 android:id="@+id/video_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
+
+            <FrameLayout
+                android:id="@+id/videoFrameLayout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+
         </androidx.cardview.widget.CardView>
 
     </androidx.cardview.widget.CardView>

common/src/main/res/values-zh-rHK/strings.xml

@@ -1547,5 +1547,6 @@
     <string name="dragon_rule6">2.用戶關注主播並參與活動，將在倒計時五分鐘結束後瓜分活動金豆；</string>
     <string name="dragon_rule7">3.此活動的最終解釋權歸PDLIVE所有。</string>
     <string name="main_type_theater">短劇</string>
+    <string name="pking_over">主播正在PK，稍後再試</string>
     <string name="guard_buy_tips_1">您將花費%s鑽石，為主播開通</string>
 </resources>

common/src/main/res/values-zh-rTW/strings.xml

@@ -1547,5 +1547,6 @@
     <string name="dragon_rule6">2.用戶關注主播並參與活動，將在倒計時五分鐘結束後瓜分活動金豆；</string>
     <string name="dragon_rule7">3.此活動的最終解釋權歸PDLIVE所有。</string>
     <string name="main_type_theater">短劇</string>
+    <string name="pking_over">主播正在PK，稍後再試</string>
     <string name="guard_buy_tips_1">您將花費%s鑽石，為主播開通</string>
 </resources>

common/src/main/res/values-zh/strings.xml

@@ -1545,5 +1545,6 @@
     <string name="dragon_rule6">2.用戶關注主播並參與活動，將在倒計時五分鐘結束後瓜分活動金豆；</string>
     <string name="dragon_rule7">3.此活動的最終解釋權歸PDLIVE所有。</string>
     <string name="main_type_theater">短劇</string>
+    <string name="pking_over">主播正在PK，稍後再試</string>
     <string name="guard_buy_tips_1">您將花費%s鑽石，為主播開通</string>
 </resources>

common/src/main/res/values/strings.xml

@@ -1570,4 +1570,5 @@ Limited ride And limited avatar frame</string>
     <string name="dragon_rule6">2.Users who follow the anchor and participate in the activity will divide the gold beans of the activity after the countdown of five minutes ends;</string>
     <string name="dragon_rule7">3.The final interpretation of this activity belongs to PDLIVE.</string>
     <string name="main_type_theater" >Theater</string>
+    <string name="pking_over">The anchor is in PK, please try again later</string>
 </resources>