6.5.4礼物冠名

common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java

@@ -48,6 +48,112 @@ public class LiveGiftBean {
 
     @JSONField(name = "operate_url")
     private String operateUrl;
+    @JSONField(name = "naming_liveuid")
+    private String namingLiveuid;
+    @JSONField(name = "naming_uid")
+    private String namingUid;
+    @JSONField(name = "naming_live_name")
+    private String namingLiveName;
+    @JSONField(name = "naming_user_name")
+    private String namingUserName;
+    @JSONField(name = "naming_live_avatar")
+    private String namingLiveAvatar;
+    @JSONField(name = "naming_user_avatar")
+    private String namingUserAvatar;
+    @JSONField(name = "naming_status")
+    private String namingStatus;
+    @JSONField(name = "naming_coin")
+    private String namingCoin;
+
+    public View getmView() {
+        return mView;
+    }
+
+    public LiveGiftBean setmView(View mView) {
+        this.mView = mView;
+        return this;
+    }
+
+    public String getmGiftNum() {
+        return mGiftNum;
+    }
+
+    public LiveGiftBean setmGiftNum(String mGiftNum) {
+        this.mGiftNum = mGiftNum;
+        return this;
+    }
+
+    public String getNamingLiveuid() {
+        return namingLiveuid;
+    }
+
+    public LiveGiftBean setNamingLiveuid(String namingLiveuid) {
+        this.namingLiveuid = namingLiveuid;
+        return this;
+    }
+
+    public String getNamingUid() {
+        return namingUid;
+    }
+
+    public LiveGiftBean setNamingUid(String namingUid) {
+        this.namingUid = namingUid;
+        return this;
+    }
+
+    public String getNamingLiveName() {
+        return namingLiveName;
+    }
+
+    public LiveGiftBean setNamingLiveName(String namingLiveName) {
+        this.namingLiveName = namingLiveName;
+        return this;
+    }
+
+    public String getNamingUserName() {
+        return namingUserName;
+    }
+
+    public LiveGiftBean setNamingUserName(String namingUserName) {
+        this.namingUserName = namingUserName;
+        return this;
+    }
+
+    public String getNamingLiveAvatar() {
+        return namingLiveAvatar;
+    }
+
+    public LiveGiftBean setNamingLiveAvatar(String namingLiveAvatar) {
+        this.namingLiveAvatar = namingLiveAvatar;
+        return this;
+    }
+
+    public String getNamingUserAvatar() {
+        return namingUserAvatar;
+    }
+
+    public LiveGiftBean setNamingUserAvatar(String namingUserAvatar) {
+        this.namingUserAvatar = namingUserAvatar;
+        return this;
+    }
+
+    public String getNamingStatus() {
+        return namingStatus;
+    }
+
+    public LiveGiftBean setNamingStatus(String namingStatus) {
+        this.namingStatus = namingStatus;
+        return this;
+    }
+
+    public String getNamingCoin() {
+        return namingCoin;
+    }
+
+    public LiveGiftBean setNamingCoin(String namingCoin) {
+        this.namingCoin = namingCoin;
+        return this;
+    }
 
     public String getOperateImage() {
         return operateImage;

common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java

@@ -542,9 +542,15 @@ public class JavascriptInterfaceUtils {
         Bus.get().post(new JavascriptInterfaceEvent()
                 .setMethod("closeLiveRoom"));
     }
+
     @JavascriptInterface
     public void clickLogOffAccount() {
         Bus.get().post(new JavascriptInterfaceEvent()
                 .setMethod("clickLogOffAccount"));
     }
+
+    @JavascriptInterface
+    public void toGiftNamingAlertAllPageView(String mAnchorName, String mLiveUid, String mAvatarUrl) {
+        RouteUtil.forwardGiftWallActivity("", mAnchorName, mLiveUid, mAvatarUrl, 0);
+    }
 }

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

@@ -6,23 +6,87 @@
     android:layout_gravity="bottom"
     android:orientation="vertical">
 
-    <ImageView
-        android:id="@+id/operate_image"
-        android:layout_width="122dp"
-        android:layout_height="50dp" />
-
     <FrameLayout
-        android:id="@+id/blind_box"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:visibility="invisible">
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
 
-        <include
+        <ImageView
+            android:id="@+id/operate_image"
+            android:layout_width="122dp"
+            android:layout_height="50dp"
+            android:layout_gravity="end|bottom" />
 
-            layout="@layout/view_blind_box" />
+        <FrameLayout
+            android:id="@+id/blind_box"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:visibility="invisible">
+
+            <include
+
+                layout="@layout/view_blind_box" />
 
 
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/naming_layout"
+            android:layout_width="match_parent"
+            android:layout_height="28dp"
+
+            android:layout_gravity="bottom"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
+            android:layout_marginBottom="5dp">
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="fitXY"
+                android:src="@mipmap/background_live_gift_gift_itle" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:layout_width="54dp"
+                    android:layout_height="13dp"
+                    android:layout_marginStart="13dp"
+                    android:src="@mipmap/icon_live_gift_gift_itle" />
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:id="@+id/naming_avatar"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginStart="6dp"
+                    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="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_weight="1"
+                    android:ellipsize="marquee"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:gravity="center"
+                    android:marqueeRepeatLimit="marquee_forever"
+                    android:scrollHorizontally="true"
+                    android:singleLine="true"
+                    android:textColor="#FFFFFFFF"
+                    android:textSize="12sp" />
+            </LinearLayout>
+        </FrameLayout>
     </FrameLayout>
 
     <RelativeLayout
@@ -245,7 +309,7 @@
                         android:layout_height="10dp"
                         android:layout_gravity="center_vertical|end"
                         android:layout_marginEnd="30dp"
-                        android:src="@mipmap/icon_arrow_right" />
+                        android:src="@mipmap/icon_arrow_right_2" />
                 </FrameLayout>
 
                 <TextView

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

@@ -1296,5 +1296,7 @@ Limited ride And limited avatar frame</string>
     <string name="received_wall2">去點亮</string>
     <string name="wall_honor">我的荣誉墙</string>
     <string name="achievement_details">成就詳情</string>
+    <string name="title_anchor">冠名主播：</string>
+    <string name="the_title_financier">冠名金主：</string>
 
 </resources>