心愿单直播间轮播入口

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

@@ -1,6 +1,7 @@
 package com.yunbao.common.bean;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.google.gson.annotations.SerializedName;
 
 /**
  * Created by cxf on 2019/3/30.
@@ -15,8 +16,80 @@ public class BannerBean {
     private String mIntoUrl;
     private int type;
     private String name;
-    private int activityId=0;
+    private int activityId = 0;
     private int mIconRes;
+    //心愿单展示数据
+    @SerializedName("wishlist_icon")
+    private String wishlistIcon;
+    @SerializedName("wishlist_num")
+    private String wishlistNum;
+    @SerializedName("wishlist_progress")
+    private String wishlistProgress;
+    @SerializedName("wishlist_name")
+    private String wishlistName;
+
+    public String getmImageUrl() {
+        return mImageUrl;
+    }
+
+    public BannerBean setmImageUrl(String mImageUrl) {
+        this.mImageUrl = mImageUrl;
+        return this;
+    }
+
+    public String getmLink() {
+        return mLink;
+    }
+
+    public BannerBean setmLink(String mLink) {
+        this.mLink = mLink;
+        return this;
+    }
+
+    public int getmIconRes() {
+        return mIconRes;
+    }
+
+    public BannerBean setmIconRes(int mIconRes) {
+        this.mIconRes = mIconRes;
+        return this;
+    }
+
+    public String getWishlistIcon() {
+        return wishlistIcon;
+    }
+
+    public BannerBean setWishlistIcon(String wishlistIcon) {
+        this.wishlistIcon = wishlistIcon;
+        return this;
+    }
+
+    public String getWishlistNum() {
+        return wishlistNum;
+    }
+
+    public BannerBean setWishlistNum(String wishlistNum) {
+        this.wishlistNum = wishlistNum;
+        return this;
+    }
+
+    public String getWishlistProgress() {
+        return wishlistProgress;
+    }
+
+    public BannerBean setWishlistProgress(String wishlistProgress) {
+        this.wishlistProgress = wishlistProgress;
+        return this;
+    }
+
+    public String getWishlistName() {
+        return wishlistName;
+    }
+
+    public BannerBean setWishlistName(String wishlistName) {
+        this.wishlistName = wishlistName;
+        return this;
+    }
 
     private StarChallengeStatusModel model;
 
@@ -80,22 +153,27 @@ public class BannerBean {
     public int getType() {
         return type;
     }
+
     @JSONField(name = "type")
     public void setType(int type) {
         this.type = type;
     }
+
     @JSONField(name = "name")
     public String getName() {
         return name;
     }
+
     @JSONField(name = "name")
     public void setName(String name) {
         this.name = name;
     }
+
     @JSONField(name = "active_id")
     public int getActivityId() {
         return activityId;
     }
+
     @JSONField(name = "active_id")
     public void setActivityId(int activityId) {
         this.activityId = activityId;

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

@@ -30,6 +30,17 @@ public class EnterRoomNewModel extends BaseModel {
     private List<LiveRoomActivityModel> liveRoomActivityModels = new ArrayList<>();//活动列表
     @SerializedName("clarityType")
     private int clarityType;
+    @SerializedName("wishListProgress")
+    private WishModel wishListProgress;
+
+    public WishModel getWishListProgress() {
+        return wishListProgress;
+    }
+
+    public EnterRoomNewModel setWishListProgress(WishModel wishListProgress) {
+        this.wishListProgress = wishListProgress;
+        return this;
+    }
 
     public List<LiveRoomActivityModel> getLiveRoomActivityModels() {
         return liveRoomActivityModels;

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

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

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

@@ -1112,5 +1112,6 @@
     <string name="live_use_discount_content">您有一張%s，是否使用？使用後開通花費鉆石%s，返還金豆%s</string>
     <string name="live_use_discount_no">不使用</string>
     <string name="live_use_discount_yes">使用</string>
+    <string name="live_use_wish">心願</string>
 
 </resources>