冠名礼物

live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java

@@ -2,6 +2,7 @@ package com.yunbao.live.views;
 
 import android.content.Context;
 import android.graphics.Color;
+import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
@@ -44,7 +45,7 @@ public class FrameGiftViewHolder extends RecyclerView.ViewHolder {
     private ScaleAnimation mAnimation;
     private LinearLayout mLoadingLayout;
     private ImageView mLoading;
-    private LinearLayout namingLayout;
+    private RelativeLayout namingLayout;
     private MarqueeTextView naming_name;
     private RoundedImageView avatar;
 

live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java

@@ -185,16 +185,13 @@ public class LiveGiftViewHolder extends AbsViewHolder {
                 !TextUtils.isEmpty(bean.getNamingUid()) &&
                 !TextUtils.equals(bean.getNamingLiveuid(), "0") &&
                 !TextUtils.equals(bean.getNamingUid(), "0")) {
-            root_back.setBackgroundResource(R.drawable.background_naming);
-            findViewById(R.id.naming_icon).setVisibility(View.VISIBLE);
+            giftNamingIcon.setVisibility(View.VISIBLE);
+            root_back.setBackgroundResource(R.mipmap.icon_live_gift_anim_11);
+            /*root_back.setBackgroundResource(R.drawable.background_naming);
+            findViewById(R.id.naming_icon).setVisibility(View.VISIBLE);*/
         } else {
-            if(bean.getUser_naming_status()==1){
-                giftNamingIcon.setVisibility(View.VISIBLE);
-                root_back.setBackgroundResource(R.mipmap.icon_live_gift_anim_11);
-            }else{
-                giftNamingIcon.setVisibility(View.GONE);
-                root_back.setBackgroundResource(R.mipmap.icon_live_gift_anim_3);
-            }
+            giftNamingIcon.setVisibility(View.VISIBLE);
+            root_back.setBackgroundResource(R.mipmap.icon_live_gift_anim_11);
             //root_back.setBackgroundResource(R.mipmap.icon_live_gift_anim_3);
             findViewById(R.id.naming_icon).setVisibility(View.GONE);
         }

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

@@ -59,43 +59,52 @@
             android:layout_gravity="end"
             android:layout_marginEnd="2dp" />
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/namingLayout"
             android:layout_width="70dp"
-            android:background="@mipmap/item_frame_gift_naming_bg"
             android:layout_height="20dp"
             android:visibility="gone"
             tools:visibility="visible"
             android:layout_marginBottom="27dp"
             android:layout_gravity="center_horizontal|bottom">
 
+            <LinearLayout
+                android:background="@mipmap/item_frame_gift_naming_bg"
+                android:layout_width="match_parent"
+                android:layout_centerVertical="true"
+                android:layout_height="18dp">
+
+                <com.yunbao.common.views.weight.MarqueeTextView
+                    android:id="@+id/naming_name"
+                    android:layout_width="0dp"
+                    android:layout_marginStart="23dp"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:ellipsize="marquee"
+                    android:layout_marginEnd="3dp"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:gravity="center"
+                    android:marqueeRepeatLimit="marquee_forever"
+                    android:scrollHorizontally="true"
+                    android:singleLine="true"
+                    android:textColor="#FFFFFFFF"
+                    android:textSize="10sp" />
+            </LinearLayout>
+
             <com.makeramen.roundedimageview.RoundedImageView
                 android:id="@+id/avatar"
                 android:layout_width="20dp"
+                android:layout_centerVertical="true"
                 android:layout_height="20dp"
                 android:scaleType="centerCrop"
                 android:src="@drawable/m_chu_xia"
                 app:riv_oval="true" />
 
-            <com.yunbao.common.views.weight.MarqueeTextView
-                android:id="@+id/naming_name"
-                android:layout_width="0dp"
-                android:layout_height="20dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="2dp"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:gravity="center_vertical"
-                android:marqueeRepeatLimit="marquee_forever"
-                android:scrollHorizontally="true"
-                android:singleLine="true"
-                android:textColor="#FFFFFFFF"
-                android:textSize="10sp" />
 
 
-        </LinearLayout>
+        </RelativeLayout>
 
     </FrameLayout>
 

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

@@ -115,6 +115,7 @@
         android:layout_width="56dp"
         android:layout_height="15dp"
         android:layout_gravity="bottom"
+        android:visibility="gone"
         android:layout_marginStart="11dp"
         android:background="@drawable/background_naming_icon"
         android:gravity="center"

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

@@ -1212,8 +1212,7 @@
             android:layout_height="51dp"
             android:translationX="500dp"
             android:visibility="invisible"
-            tools:translationX="0dp"
-            tools:visibility="visible">
+            tools:translationX="0dp">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"