盲盒全服通知逻辑

live/src/main/res/drawable/bg_all_server_336cf7.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="13dp" />
+    <solid android:color="#336CF7" />
+</shape>

live/src/main/res/drawable/bg_all_server_fcb50e.xml

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

live/src/main/res/drawable/bg_all_server_fd5a9d.xml

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

live/src/main/res/layout/dialog_live_gift_wrap.xml

@@ -8,7 +8,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
+        android:layout_marginBottom="5dp"
         android:orientation="horizontal">
 
         <LinearLayout
@@ -44,6 +44,8 @@
             android:layout_width="102dp"
             android:layout_height="31dp"
             android:layout_alignParentEnd="true"
+            android:layout_marginTop="70dp"
+            android:layout_marginBottom="5dp"
             android:background="@drawable/bg_live_vip_blue"
             android:gravity="center"
             android:orientation="horizontal">
@@ -68,9 +70,9 @@
                     android:layout_height="match_parent"
                     android:layout_gravity="start"
                     android:text="@string/live_gift_buy_gold"
-                    android:textStyle="bold"
                     android:textColor="#F5C600"
-                    android:textSize="10sp" />
+                    android:textSize="10sp"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/vipGoldDesc"
@@ -89,7 +91,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:visibility="gone">
+            android:visibility="invisible">
 
             <include
 

live/src/main/res/layout/view_blind_box.xml

@@ -9,15 +9,14 @@
         android:id="@+id/frame_blind_top"
         android:layout_width="match_parent"
         android:layout_height="86.5dp"
-        android:background="@mipmap/bg_phoenix">
+        android:background="@mipmap/bg_kirin">
 
         <com.opensource.svgaplayer.SVGAImageView
             android:id="@+id/blind_svga"
             android:layout_width="29dp"
             android:layout_height="29dp"
             android:layout_marginStart="14dp"
-            android:layout_marginTop="51dp"
-            />
+            android:layout_marginTop="51dp" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -33,8 +32,8 @@
                 <ProgressBar
                     android:id="@+id/progress_blind3"
                     style="@android:style/Widget.ProgressBar.Horizontal"
-                    android:layout_width="74dp"
-                    android:layout_height="6dp"
+                    android:layout_width="80dp"
+                    android:layout_height="8dp"
                     android:layout_gravity="center"
                     android:max="100"
                     android:progress="30"
@@ -44,8 +43,8 @@
                 <ProgressBar
                     android:id="@+id/progress_blind1"
                     style="@android:style/Widget.ProgressBar.Horizontal"
-                    android:layout_width="74dp"
-                    android:layout_height="6dp"
+                    android:layout_width="80dp"
+                    android:layout_height="8dp"
                     android:layout_gravity="center"
                     android:max="100"
                     android:progress="50"
@@ -55,8 +54,8 @@
                 <ProgressBar
                     android:id="@+id/progress_blind2"
                     style="@android:style/Widget.ProgressBar.Horizontal"
-                    android:layout_width="74dp"
-                    android:layout_height="6dp"
+                    android:layout_width="80dp"
+                    android:layout_height="8dp"
                     android:layout_gravity="center"
                     android:max="100"
                     android:progress="50"
@@ -72,26 +71,28 @@
             </FrameLayout>
 
 
-            <TextView
-                android:id="@+id/blind_number"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:textColor="@color/white"
-                android:textSize="6sp" />
         </LinearLayout>
 
+        <TextView
+            android:id="@+id/blind_number"
+            android:layout_width="90dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="47dp"
+            android:layout_marginTop="71dp"
+            android:textColor="@color/white"
+            android:textSize="8sp" />
+
         <ImageView
             android:layout_width="13dp"
             android:layout_height="13dp"
             android:layout_gravity="end"
-            android:layout_marginTop="47dp"
-            android:layout_marginEnd="19dp"
+            android:layout_marginTop="40dp"
+            android:layout_marginEnd="15dp"
             android:src="@mipmap/icon_what" />
     </FrameLayout>
 
     <FrameLayout
-        android:layout_width="139dp"
+        android:layout_width="149dp"
         android:layout_height="match_parent"
         android:background="@mipmap/bg_blind_bottom">
 
@@ -100,15 +101,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_margin="7dp"
+            android:layout_margin="5dp"
             android:ellipsize="marquee"
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:gravity="center"
-            android:textSize="7sp"
             android:marqueeRepeatLimit="marquee_forever"
             android:scrollHorizontally="true"
             android:singleLine="true"
-            android:textColor="@color/white" />
+            android:textColor="@color/white"
+            android:textSize="10sp" />
     </FrameLayout>
 </LinearLayout>

live/src/main/res/layout/view_live_room.xml

@@ -970,6 +970,7 @@
             android:visibility="invisible">
 
             <LinearLayout
+                android:id="@+id/bg_all_server"
                 android:layout_width="match_parent"
                 android:layout_height="30dp"
                 android:layout_gravity="center_vertical"
@@ -978,8 +979,9 @@
                 android:background="@drawable/bg_live_gift_tip"
                 android:gravity="center|left"
                 android:orientation="horizontal">
-
+<!--盲盒头条-->
                 <View
+                    android:id="@+id/super_notice"
                     android:layout_width="63dp"
                     android:layout_height="18sp"
                     android:layout_marginLeft="18dp"