Merge branch 'master' into dev_6.5.4_tmp

# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
#	common/src/main/res/values-en-rUS/string.xml
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

common/build.gradle

@@ -194,5 +194,6 @@ dependencies {
     //选择器
     api 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.11'
     api 'com.github.gzu-liyujiang.AndroidPicker:WheelView:4.1.11'
-
+    //自定义圆角图片
+    api 'com.makeramen:roundedimageview:2.3.0'
 }

common/src/main/java/com/yunbao/common/adapter/AchievementDetailsAdapter.java

@@ -0,0 +1,41 @@
+package com.yunbao.common.adapter;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.UserMedalModel;
+import com.yunbao.common.views.AchievementDetailsViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AchievementDetailsAdapter extends RecyclerView.Adapter {
+    private List<UserMedalModel> dressInfo = new ArrayList<>();
+
+    public AchievementDetailsAdapter(List<UserMedalModel> dressInfo) {
+        this.dressInfo = dressInfo;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_achievement_details, parent, false);
+        return new AchievementDetailsViewHolder(herdView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        AchievementDetailsViewHolder achievementDetailsViewHolder = (AchievementDetailsViewHolder) holder;
+        achievementDetailsViewHolder.showData(dressInfo.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return dressInfo.size();
+    }
+}

common/src/main/java/com/yunbao/common/adapter/GiftAlreadyWallAdapter.java

@@ -0,0 +1,43 @@
+package com.yunbao.common.adapter;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.GiftWallModel;
+import com.yunbao.common.views.GiftAlreadyWallViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GiftAlreadyWallAdapter extends RecyclerView.Adapter {
+    private List<GiftWallModel> giftWall = new ArrayList<>();
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_gift_already_wall, parent, false);
+        return new GiftAlreadyWallViewHolder(herdView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        GiftAlreadyWallViewHolder withoutWallViewHolder = (GiftAlreadyWallViewHolder) holder;
+        withoutWallViewHolder.showData(giftWall.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return giftWall.size();
+    }
+
+    public void addAllData(List<GiftWallModel> mGiftWall) {
+        giftWall.clear();
+        giftWall.addAll(mGiftWall);
+        notifyDataSetChanged();
+    }
+}

common/src/main/java/com/yunbao/common/adapter/GiftNumberAdapter.java

@@ -0,0 +1,40 @@
+package com.yunbao.common.adapter;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.GiftQuantityModel;
+import com.yunbao.common.views.GiftNumber;
+
+import java.util.List;
+
+public class GiftNumberAdapter extends RecyclerView.Adapter {
+    private List<GiftQuantityModel> giftQuantityModels;
+
+    public GiftNumberAdapter(List<GiftQuantityModel> giftQuantityModels) {
+        this.giftQuantityModels = giftQuantityModels;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View robotSayHelloView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_gift_number, parent, false);
+        return new GiftNumber(robotSayHelloView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        GiftNumber giftNumber = (GiftNumber) holder;
+        giftNumber.showData(giftQuantityModels.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return giftQuantityModels.size();
+    }
+}

common/src/main/java/com/yunbao/common/adapter/GiftWithoutWallAdapter.java

@@ -0,0 +1,43 @@
+package com.yunbao.common.adapter;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.GiftWallModel;
+import com.yunbao.common.views.GiftWithoutWallViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GiftWithoutWallAdapter extends RecyclerView.Adapter {
+    private List<GiftWallModel> giftWall = new ArrayList<>();
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_gift_without_wall, parent, false);
+        return new GiftWithoutWallViewHolder(herdView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        GiftWithoutWallViewHolder withoutWallViewHolder = (GiftWithoutWallViewHolder) holder;
+        withoutWallViewHolder.showData(giftWall.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return giftWall.size();
+    }
+
+    public void addAllData(List<GiftWallModel> mGiftWall) {
+        giftWall.clear();
+        giftWall.addAll(mGiftWall);
+        notifyDataSetChanged();
+    }
+}

common/src/main/java/com/yunbao/common/adapter/MedalAchievementAdapter.java

@@ -0,0 +1,44 @@
+package com.yunbao.common.adapter;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.UserMedalListModel;
+import com.yunbao.common.views.MedalAchievementViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MedalAchievementAdapter extends RecyclerView.Adapter {
+    private List<UserMedalListModel> medalData = new ArrayList<>();
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_medal_achievement, parent, false);
+        return new MedalAchievementViewHolder(herdView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        MedalAchievementViewHolder achievementViewHolder = (MedalAchievementViewHolder) holder;
+        achievementViewHolder.showData(medalData.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return medalData.size();
+    }
+
+    public void addAllData(List<UserMedalListModel> mGiftWall) {
+
+        medalData.clear();
+        medalData.addAll(mGiftWall);
+        notifyDataSetChanged();
+    }
+}

common/src/main/java/com/yunbao/common/adapter/MonthGiftNamingAdapter.java

@@ -0,0 +1,43 @@
+package com.yunbao.common.adapter;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.GiftWallModel;
+import com.yunbao.common.views.MonthGiftNamingViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MonthGiftNamingAdapter extends RecyclerView.Adapter {
+    private List<GiftWallModel> giftWall = new ArrayList<>();
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_month_gift_naming, parent, false);
+        return new MonthGiftNamingViewHolder(herdView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        MonthGiftNamingViewHolder monthGiftNamingViewHolder = (MonthGiftNamingViewHolder) holder;
+        monthGiftNamingViewHolder.showData(giftWall.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return giftWall.size();
+    }
+
+    public void addAllData(List<GiftWallModel> mGiftWall) {
+        giftWall.clear();
+        giftWall.addAll(mGiftWall);
+        notifyDataSetChanged();
+    }
+}

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

@@ -109,6 +109,29 @@ public class EnterRoomInfoModel extends BaseModel {
     @SerializedName("red_packet")
     private RedPacketModel redPacketModel;
 
+    @SerializedName("gift_wall_lighten_number")
+    private String giftWallLightenNumber;
+    @SerializedName("gift_wall_lighten_total")
+    private String giftWallLightenTotal;
+
+    public String getGiftWallLightenNumber() {
+        return giftWallLightenNumber;
+    }
+
+    public EnterRoomInfoModel setGiftWallLightenNumber(String giftWallLightenNumber) {
+        this.giftWallLightenNumber = giftWallLightenNumber;
+        return this;
+    }
+
+    public String getGiftWallLightenTotal() {
+        return giftWallLightenTotal;
+    }
+
+    public EnterRoomInfoModel setGiftWallLightenTotal(String giftWallLightenTotal) {
+        this.giftWallLightenTotal = giftWallLightenTotal;
+        return this;
+    }
+
     public RedPacketModel getRedPacketModel() {
         return redPacketModel;
     }

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

@@ -0,0 +1,44 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+/**
+ * 礼物墙已点亮
+ */
+public class GiftAlreadyWallModel extends BaseModel {
+    @SerializedName("gift_wall")
+    private List<GiftWallModel> giftWall;
+    @SerializedName("gift_wall_lighten_number")
+    private String giftWallLightenNumber;
+    @SerializedName("gift_wall_lighten_total")
+    private String giftWallLightenTotal;
+
+    public List<GiftWallModel> getGiftWall() {
+        return giftWall;
+    }
+
+    public GiftAlreadyWallModel setGiftWall(List<GiftWallModel> giftWall) {
+        this.giftWall = giftWall;
+        return this;
+    }
+
+    public String getGiftWallLightenNumber() {
+        return giftWallLightenNumber;
+    }
+
+    public GiftAlreadyWallModel setGiftWallLightenNumber(String giftWallLightenNumber) {
+        this.giftWallLightenNumber = giftWallLightenNumber;
+        return this;
+    }
+
+    public String getGiftWallLightenTotal() {
+        return giftWallLightenTotal;
+    }
+
+    public GiftAlreadyWallModel setGiftWallLightenTotal(String giftWallLightenTotal) {
+        this.giftWallLightenTotal = giftWallLightenTotal;
+        return this;
+    }
+}

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

@@ -0,0 +1,119 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class GiftGuideModel extends BaseModel {
+
+    @SerializedName("guide_name")
+    private String guideName;
+    @SerializedName("illuminate_count")
+    private int illuminateCount;
+    @SerializedName("already_font")
+    private String alreadyFont;
+    @SerializedName("without_font")
+    private String withoutFont;
+    @SerializedName("number")
+    private String number;
+    @SerializedName("illuminate_total")
+    private int illuminateTotal;
+    @SerializedName("week_number")
+    private String weekNumber;
+    @SerializedName("guide_name_img_path")
+    private String guideNameImgPath;
+    @SerializedName("guide_background_picture_path")
+    private String guideBackgroundPicturePath;
+    @SerializedName("gift_data")
+    private List<GiftWallModel> giftData;
+
+    public String getAlreadyFont() {
+        return alreadyFont;
+    }
+
+    public GiftGuideModel setAlreadyFont(String alreadyFont) {
+        this.alreadyFont = alreadyFont;
+        return this;
+    }
+
+    public String getWithoutFont() {
+        return withoutFont;
+    }
+
+    public GiftGuideModel setWithoutFont(String withoutFont) {
+        this.withoutFont = withoutFont;
+        return this;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public GiftGuideModel setNumber(String number) {
+        this.number = number;
+        return this;
+    }
+
+    public int getIlluminateTotal() {
+        return illuminateTotal;
+    }
+
+    public GiftGuideModel setIlluminateTotal(int illuminateTotal) {
+        this.illuminateTotal = illuminateTotal;
+        return this;
+    }
+
+    public String getWeekNumber() {
+        return weekNumber;
+    }
+
+    public GiftGuideModel setWeekNumber(String weekNumber) {
+        this.weekNumber = weekNumber;
+        return this;
+    }
+
+    public String getGuideNameImgPath() {
+        return guideNameImgPath;
+    }
+
+    public GiftGuideModel setGuideNameImgPath(String guideNameImgPath) {
+        this.guideNameImgPath = guideNameImgPath;
+        return this;
+    }
+
+    public String getGuideBackgroundPicturePath() {
+        return guideBackgroundPicturePath;
+    }
+
+    public GiftGuideModel setGuideBackgroundPicturePath(String guideBackgroundPicturePath) {
+        this.guideBackgroundPicturePath = guideBackgroundPicturePath;
+        return this;
+    }
+
+    public String getGuideName() {
+        return guideName;
+    }
+
+    public GiftGuideModel setGuideName(String guideName) {
+        this.guideName = guideName;
+        return this;
+    }
+
+    public int getIlluminateCount() {
+        return illuminateCount;
+    }
+
+    public GiftGuideModel setIlluminateCount(int illuminateCount) {
+        this.illuminateCount = illuminateCount;
+        return this;
+    }
+
+    public List<GiftWallModel> getGiftData() {
+        return giftData;
+    }
+
+    public GiftGuideModel setGiftData(List<GiftWallModel> giftData) {
+        this.giftData = giftData;
+        return this;
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 礼物选择数量
+ */
+public class GiftQuantityModel extends BaseModel {
+
+    @SerializedName("id")
+    private String id;
+    @SerializedName("gift_quantity")
+    private String giftQuantity;
+    @SerializedName("font_colour")
+    private String fontColour;
+
+    public String getId() {
+        return id;
+    }
+
+    public GiftQuantityModel setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getGiftQuantity() {
+        return giftQuantity;
+    }
+
+    public GiftQuantityModel setGiftQuantity(String giftQuantity) {
+        this.giftQuantity = giftQuantity;
+        return this;
+    }
+
+    public String getFontColour() {
+        return fontColour;
+    }
+
+    public GiftQuantityModel setFontColour(String fontColour) {
+        this.fontColour = fontColour;
+        return this;
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class GiftWallGiftDetail extends BaseModel {
+
+    @SerializedName("uid")
+    private int uid;
+    @SerializedName("user_nicename")
+    private String userNicename;
+    @SerializedName("avatar")
+    private String avatar;
+    @SerializedName("naming_coin")
+    private int namingCoin;
+
+    public int getUid() {
+        return uid;
+    }
+
+    public GiftWallGiftDetail setUid(int uid) {
+        this.uid = uid;
+        return this;
+    }
+
+    public String getUserNicename() {
+        return userNicename;
+    }
+
+    public GiftWallGiftDetail setUserNicename(String userNicename) {
+        this.userNicename = userNicename;
+        return this;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public GiftWallGiftDetail setAvatar(String avatar) {
+        this.avatar = avatar;
+        return this;
+    }
+
+    public int getNamingCoin() {
+        return namingCoin;
+    }
+
+    public GiftWallGiftDetail setNamingCoin(int namingCoin) {
+        this.namingCoin = namingCoin;
+        return this;
+    }
+}

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

@@ -0,0 +1,392 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class GiftWallModel extends BaseModel {
+    @SerializedName("id")
+    private String id;
+    @SerializedName("sendtype")
+    private String sendtype;
+    @SerializedName("type")
+    private String type;
+    @SerializedName("name")
+    private String name;
+    @SerializedName("release_status")
+    private String releaseStatus;
+    @SerializedName("type_sort")
+    private String typeSort;
+    @SerializedName("operate_image")
+    private String operateImage;
+    @SerializedName("operate_url")
+    private String operateUrl;
+    @SerializedName("mark")
+    private String mark;
+    @SerializedName("giftname")
+    private String giftname;
+    @SerializedName("needcoin")
+    private String needcoin;
+    @SerializedName("gifticon")
+    private String gifticon;
+    @SerializedName("gift_description")
+    private String giftDescription;
+    @SerializedName("corner_mark")
+    private String cornerMark;
+    @SerializedName("swf")
+    private String swf;
+    @SerializedName("gift_uid")
+    private String giftUid;
+    @SerializedName("type_start_time")
+    private String typeStartTime;
+    @SerializedName("type_end_time")
+    private String typeEndTime;
+    @SerializedName("gift_start_time")
+    private String giftStartTime;
+    @SerializedName("gift_end_time")
+    private String giftEndTime;
+    @SerializedName("naming_liveuid")
+    private String namingLiveuid;
+    @SerializedName("naming_uid")
+    private String namingUid;
+    @SerializedName("naming_live_name")
+    private String namingLiveName;
+    @SerializedName("naming_user_name")
+    private String namingUserName;
+    @SerializedName("naming_live_avatar")
+    private String namingLiveAvatar;
+    @SerializedName("naming_user_avatar")
+    private String namingUserAvatar;
+    @SerializedName("naming_status")
+    private String namingStatus;
+    @SerializedName("naming_coin")
+    private String namingCoin;
+    @SerializedName("gifticon_total")
+    private String gifticonTotal;
+    @SerializedName("gift_count_number")
+    private String giftCountNumber;
+    @SerializedName("user_nicename")
+    private String userNicename;
+    @SerializedName("avatar")
+    private String avatar;
+    @SerializedName("naming_coin_max")
+    private String namingCoinMax;
+
+    @SerializedName("illuminate_status")
+    private int illuminateStatus;
+    @SerializedName("font_color")
+    private String fontColor;
+
+    public String getFontColor() {
+        return fontColor;
+    }
+
+    public GiftWallModel setFontColor(String fontColor) {
+        this.fontColor = fontColor;
+        return this;
+    }
+
+    public int getIlluminateStatus() {
+        return illuminateStatus;
+    }
+
+    public GiftWallModel setIlluminateStatus(int illuminateStatus) {
+        this.illuminateStatus = illuminateStatus;
+        return this;
+    }
+
+    public String getNamingCoinMax() {
+        return namingCoinMax;
+    }
+
+    public GiftWallModel setNamingCoinMax(String namingCoinMax) {
+        this.namingCoinMax = namingCoinMax;
+        return this;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public GiftWallModel setAvatar(String avatar) {
+        this.avatar = avatar;
+        return this;
+    }
+
+    public String getUserNicename() {
+        return userNicename;
+    }
+
+    public GiftWallModel setUserNicename(String userNicename) {
+        this.userNicename = userNicename;
+        return this;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public GiftWallModel setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getSendtype() {
+        return sendtype;
+    }
+
+    public GiftWallModel setSendtype(String sendtype) {
+        this.sendtype = sendtype;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public GiftWallModel setType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public GiftWallModel setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getReleaseStatus() {
+        return releaseStatus;
+    }
+
+    public GiftWallModel setReleaseStatus(String releaseStatus) {
+        this.releaseStatus = releaseStatus;
+        return this;
+    }
+
+    public String getTypeSort() {
+        return typeSort;
+    }
+
+    public GiftWallModel setTypeSort(String typeSort) {
+        this.typeSort = typeSort;
+        return this;
+    }
+
+    public String getOperateImage() {
+        return operateImage;
+    }
+
+    public GiftWallModel setOperateImage(String operateImage) {
+        this.operateImage = operateImage;
+        return this;
+    }
+
+    public String getOperateUrl() {
+        return operateUrl;
+    }
+
+    public GiftWallModel setOperateUrl(String operateUrl) {
+        this.operateUrl = operateUrl;
+        return this;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+    public GiftWallModel setMark(String mark) {
+        this.mark = mark;
+        return this;
+    }
+
+    public String getGiftname() {
+        return giftname;
+    }
+
+    public GiftWallModel setGiftname(String giftname) {
+        this.giftname = giftname;
+        return this;
+    }
+
+    public String getNeedcoin() {
+        return needcoin;
+    }
+
+    public GiftWallModel setNeedcoin(String needcoin) {
+        this.needcoin = needcoin;
+        return this;
+    }
+
+    public String getGifticon() {
+        return gifticon;
+    }
+
+    public GiftWallModel setGifticon(String gifticon) {
+        this.gifticon = gifticon;
+        return this;
+    }
+
+    public String getGiftDescription() {
+        return giftDescription;
+    }
+
+    public GiftWallModel setGiftDescription(String giftDescription) {
+        this.giftDescription = giftDescription;
+        return this;
+    }
+
+    public String getCornerMark() {
+        return cornerMark;
+    }
+
+    public GiftWallModel setCornerMark(String cornerMark) {
+        this.cornerMark = cornerMark;
+        return this;
+    }
+
+    public String getSwf() {
+        return swf;
+    }
+
+    public GiftWallModel setSwf(String swf) {
+        this.swf = swf;
+        return this;
+    }
+
+    public String getGiftUid() {
+        return giftUid;
+    }
+
+    public GiftWallModel setGiftUid(String giftUid) {
+        this.giftUid = giftUid;
+        return this;
+    }
+
+    public String getTypeStartTime() {
+        return typeStartTime;
+    }
+
+    public GiftWallModel setTypeStartTime(String typeStartTime) {
+        this.typeStartTime = typeStartTime;
+        return this;
+    }
+
+    public String getTypeEndTime() {
+        return typeEndTime;
+    }
+
+    public GiftWallModel setTypeEndTime(String typeEndTime) {
+        this.typeEndTime = typeEndTime;
+        return this;
+    }
+
+    public String getGiftStartTime() {
+        return giftStartTime;
+    }
+
+    public GiftWallModel setGiftStartTime(String giftStartTime) {
+        this.giftStartTime = giftStartTime;
+        return this;
+    }
+
+    public String getGiftEndTime() {
+        return giftEndTime;
+    }
+
+    public GiftWallModel setGiftEndTime(String giftEndTime) {
+        this.giftEndTime = giftEndTime;
+        return this;
+    }
+
+    public String getNamingLiveuid() {
+        return namingLiveuid;
+    }
+
+    public GiftWallModel setNamingLiveuid(String namingLiveuid) {
+        this.namingLiveuid = namingLiveuid;
+        return this;
+    }
+
+    public String getNamingUid() {
+        return namingUid;
+    }
+
+    public GiftWallModel setNamingUid(String namingUid) {
+        this.namingUid = namingUid;
+        return this;
+    }
+
+    public String getNamingLiveName() {
+        return namingLiveName;
+    }
+
+    public GiftWallModel setNamingLiveName(String namingLiveName) {
+        this.namingLiveName = namingLiveName;
+        return this;
+    }
+
+    public String getNamingUserName() {
+        return namingUserName;
+    }
+
+    public GiftWallModel setNamingUserName(String namingUserName) {
+        this.namingUserName = namingUserName;
+        return this;
+    }
+
+    public String getNamingLiveAvatar() {
+        return namingLiveAvatar;
+    }
+
+    public GiftWallModel setNamingLiveAvatar(String namingLiveAvatar) {
+        this.namingLiveAvatar = namingLiveAvatar;
+        return this;
+    }
+
+    public String getNamingUserAvatar() {
+        return namingUserAvatar;
+    }
+
+    public GiftWallModel setNamingUserAvatar(String namingUserAvatar) {
+        this.namingUserAvatar = namingUserAvatar;
+        return this;
+    }
+
+    public String getNamingStatus() {
+        return namingStatus;
+    }
+
+    public GiftWallModel setNamingStatus(String namingStatus) {
+        this.namingStatus = namingStatus;
+        return this;
+    }
+
+    public String getNamingCoin() {
+        return namingCoin;
+    }
+
+    public GiftWallModel setNamingCoin(String namingCoin) {
+        this.namingCoin = namingCoin;
+        return this;
+    }
+
+    public String getGifticonTotal() {
+        return gifticonTotal;
+    }
+
+    public GiftWallModel setGifticonTotal(String gifticonTotal) {
+        this.gifticonTotal = gifticonTotal;
+        return this;
+    }
+
+    public String getGiftCountNumber() {
+        return giftCountNumber;
+    }
+
+    public GiftWallModel setGiftCountNumber(String giftCountNumber) {
+        this.giftCountNumber = giftCountNumber;
+        return this;
+    }
+}

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

@@ -23,7 +23,7 @@ public class LiveGiftBean {
     private String name;
     private String price;
     private String icon;
-    private boolean checked;
+    private boolean checked = false;
     private int page;
     private View mView;
     private String sendType;//支付是金币还是钻石
@@ -36,6 +36,160 @@ public class LiveGiftBean {
     private String tag;
     @JSONField(name = "blind_box_type")
     private int blind_box_type = 0;
+    //礼物角标
+
+    @JSONField(name = "corner_mark")
+    private String cornerMark;
+    @JSONField(name = "gift_description")
+    private String giftDescription;
+
+    @JSONField(name = "operate_image")
+    private String operateImage;
+
+    @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;
+    }
+
+    public LiveGiftBean setOperateImage(String operateImage) {
+        this.operateImage = operateImage;
+        return this;
+    }
+
+    public String getOperateUrl() {
+        return operateUrl;
+    }
+
+    public LiveGiftBean setOperateUrl(String operateUrl) {
+        this.operateUrl = operateUrl;
+        return this;
+    }
+
+    public String getGiftDescription() {
+        return giftDescription;
+    }
+
+    public LiveGiftBean setGiftDescription(String giftDescription) {
+        this.giftDescription = giftDescription;
+        return this;
+    }
+
+    public String getCornerMark() {
+        return cornerMark;
+    }
+
+    public LiveGiftBean setCornerMark(String cornerMark) {
+        this.cornerMark = cornerMark;
+        return this;
+    }
 
     private int fansGiftLevel=0;//粉丝团礼物等级要求
 

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

@@ -0,0 +1,42 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class MedalAchievementModel extends BaseModel {
+
+    @SerializedName("medal_total_number")
+    private String medalTotalNumber;
+    @SerializedName("medal_light_number")
+    private String medalLightNumber;
+    @SerializedName("medal_data")
+    private List<UserMedalListModel> medalData;
+
+    public String getMedalTotalNumber() {
+        return medalTotalNumber;
+    }
+
+    public MedalAchievementModel setMedalTotalNumber(String medalTotalNumber) {
+        this.medalTotalNumber = medalTotalNumber;
+        return this;
+    }
+
+    public String getMedalLightNumber() {
+        return medalLightNumber;
+    }
+
+    public MedalAchievementModel setMedalLightNumber(String medalLightNumber) {
+        this.medalLightNumber = medalLightNumber;
+        return this;
+    }
+
+    public List<UserMedalListModel> getMedalData() {
+        return medalData;
+    }
+
+    public MedalAchievementModel setMedalData(List<UserMedalListModel> medalData) {
+        this.medalData = medalData;
+        return this;
+    }
+}

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

@@ -0,0 +1,76 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class UserMedalListModel extends BaseModel {
+
+    @SerializedName("dress_name")
+    private String dressName;
+    @SerializedName("dress_info")
+    private List<UserMedalModel> dressInfo = new ArrayList<>();
+    @SerializedName("display_src")
+    private String displaySrc;
+    @SerializedName("dress_description")
+    private String dressDescription;
+    @SerializedName("display_src_second")
+    private String displaySrcSecond;
+    @SerializedName("dress_status")//1Hd2whd
+    private String dressStatus;
+
+    public String getDressDescription() {
+        return dressDescription;
+    }
+
+    public UserMedalListModel setDressDescription(String dressDescription) {
+        this.dressDescription = dressDescription;
+        return this;
+    }
+
+    public String getDisplaySrcSecond() {
+        return displaySrcSecond;
+    }
+
+    public UserMedalListModel setDisplaySrcSecond(String displaySrcSecond) {
+        this.displaySrcSecond = displaySrcSecond;
+        return this;
+    }
+
+    public String getDressStatus() {
+        return dressStatus;
+    }
+
+    public UserMedalListModel setDressStatus(String dressStatus) {
+        this.dressStatus = dressStatus;
+        return this;
+    }
+
+    public String getDressName() {
+        return dressName;
+    }
+
+    public UserMedalListModel setDressName(String dressName) {
+        this.dressName = dressName;
+        return this;
+    }
+
+    public List<UserMedalModel> getDressInfo() {
+        return dressInfo;
+    }
+
+    public UserMedalListModel setDressInfo(List<UserMedalModel> dressInfo) {
+        this.dressInfo = dressInfo;
+        return this;
+    }
+
+    public String getDisplaySrc() {
+        return displaySrc;
+    }
+
+    public UserMedalListModel setDisplaySrc(String displaySrc) {
+        this.displaySrc = displaySrc;
+        return this;
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class UserMedalModel extends BaseModel {
+    @SerializedName("id")
+    private String id;
+    @SerializedName("display_src")
+    private String displaySrc;
+    @SerializedName("dress_name")
+    private String dressName;
+    @SerializedName("dress_description")
+    private String dressDescription;
+    @SerializedName("sort")
+    private String sort;
+    @SerializedName("dress_status")
+    private String dressStatus;
+
+    public String getId() {
+        return id;
+    }
+
+    public UserMedalModel setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getDisplaySrc() {
+        return displaySrc;
+    }
+
+    public UserMedalModel setDisplaySrc(String displaySrc) {
+        this.displaySrc = displaySrc;
+        return this;
+    }
+
+    public String getDressName() {
+        return dressName;
+    }
+
+    public UserMedalModel setDressName(String dressName) {
+        this.dressName = dressName;
+        return this;
+    }
+
+    public String getDressDescription() {
+        return dressDescription;
+    }
+
+    public UserMedalModel setDressDescription(String dressDescription) {
+        this.dressDescription = dressDescription;
+        return this;
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public UserMedalModel setSort(String sort) {
+        this.sort = sort;
+        return this;
+    }
+
+    public String getDressStatus() {
+        return dressStatus;
+    }
+
+    public UserMedalModel setDressStatus(String dressStatus) {
+        this.dressStatus = dressStatus;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/dialog/AchievementDetailsPopup.java

@@ -0,0 +1,93 @@
+package com.yunbao.common.dialog;
+
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.lxj.xpopup.core.CenterPopupView;
+import com.yunbao.common.R;
+import com.yunbao.common.adapter.AchievementDetailsAdapter;
+import com.yunbao.common.bean.UserMedalListModel;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+public class AchievementDetailsPopup extends CenterPopupView {
+    private UserMedalListModel userMedalListModel;
+    private ImageView achievementImg;
+    private TextView dressName, dressDescription;
+    private View havaDataList, havaData;
+    private AchievementDetailsAdapter achievementDetailsAdapter;
+private RecyclerView achievementImgList;
+    public AchievementDetailsPopup(@NonNull Context context, UserMedalListModel userMedalListModel) {
+        super(context);
+        this.userMedalListModel = userMedalListModel;
+    }
+
+    @Override
+    protected int getImplLayoutId() {
+        return R.layout.popup_achievement_details;
+    }
+
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        havaDataList = findViewById(R.id.hava_data_list);
+        havaData = findViewById(R.id.hava_data);
+        if (userMedalListModel.getDressInfo().size() > 0) {
+            havaDataList.setVisibility(GONE);
+            havaData.setVisibility(VISIBLE);
+            achievementDetailsAdapter = new AchievementDetailsAdapter(userMedalListModel.getDressInfo());
+
+            achievementImg = findViewById(R.id.achievement_img2);
+            dressName = findViewById(R.id.dress_name2);
+            dressDescription = findViewById(R.id.dress_description2);
+            achievementImgList = findViewById(R.id.achievement_img_list);
+
+            if (TextUtils.equals(userMedalListModel.getDressStatus(), "1")) {
+                ImgLoader.display(getContext(), userMedalListModel.getDisplaySrc(), achievementImg);
+            } else {
+                ImgLoader.display(getContext(), userMedalListModel.getDisplaySrcSecond(), achievementImg);
+            }
+            dressName.setText(userMedalListModel.getDressName());
+            dressDescription.setText(userMedalListModel.getDressDescription());
+            achievementImgList.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
+            achievementImgList.setAdapter(achievementDetailsAdapter);
+            ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.gift_details_btn2), new ViewClicksAntiShake.ViewClicksCallBack() {
+                @Override
+                public void onViewClicks() {
+                    dialog.dismiss();
+                }
+            });
+
+        } else {
+            havaDataList.setVisibility(VISIBLE);
+            havaData.setVisibility(GONE);
+
+            achievementImg = findViewById(R.id.achievement_img);
+            dressName = findViewById(R.id.dress_name);
+            dressDescription = findViewById(R.id.dress_description);
+
+            if (TextUtils.equals(userMedalListModel.getDressStatus(), "1")) {
+                ImgLoader.display(getContext(), userMedalListModel.getDisplaySrc(), achievementImg);
+            } else {
+                ImgLoader.display(getContext(), userMedalListModel.getDisplaySrcSecond(), achievementImg);
+            }
+            dressName.setText(userMedalListModel.getDressName());
+            dressDescription.setText(userMedalListModel.getDressDescription());
+            ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.gift_details_btn), new ViewClicksAntiShake.ViewClicksCallBack() {
+                @Override
+                public void onViewClicks() {
+                    dialog.dismiss();
+                }
+            });
+        }
+
+    }
+}

common/src/main/java/com/yunbao/common/event/CodexEvent.java

@@ -0,0 +1,6 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class CodexEvent extends BaseModel {
+}

common/src/main/java/com/yunbao/common/event/GiftNumberEvent.java

@@ -0,0 +1,16 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class GiftNumberEvent extends BaseModel {
+    private String mCount;
+
+    public String getmCount() {
+        return mCount;
+    }
+
+    public GiftNumberEvent setmCount(String mCount) {
+        this.mCount = mCount;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/event/GiftWallIlluminateEvent.java

@@ -0,0 +1,52 @@
+package com.yunbao.common.event;
+
+import com.google.gson.annotations.SerializedName;
+import com.yunbao.common.bean.BaseModel;
+
+public class GiftWallIlluminateEvent extends BaseModel {
+
+    @SerializedName("_method_")
+    private String method;
+    @SerializedName("action")
+    private String action;
+    @SerializedName("max_number")
+    private int maxNumber;
+    @SerializedName("new_number")
+    private int newNumber;
+
+    public String getMethod() {
+        return method;
+    }
+
+    public GiftWallIlluminateEvent setMethod(String method) {
+        this.method = method;
+        return this;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public GiftWallIlluminateEvent setAction(String action) {
+        this.action = action;
+        return this;
+    }
+
+    public int getMaxNumber() {
+        return maxNumber;
+    }
+
+    public GiftWallIlluminateEvent setMaxNumber(int maxNumber) {
+        this.maxNumber = maxNumber;
+        return this;
+    }
+
+    public int getNewNumber() {
+        return newNumber;
+    }
+
+    public GiftWallIlluminateEvent setNewNumber(int newNumber) {
+        this.newNumber = newNumber;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/event/GiftWallItemEvent.java

@@ -0,0 +1,27 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+import com.yunbao.common.bean.GiftWallModel;
+
+public class GiftWallItemEvent extends BaseModel {
+    private GiftWallModel giftWallModel;
+    private boolean unlit;
+
+    public GiftWallModel getGiftWallModel() {
+        return giftWallModel;
+    }
+
+    public GiftWallItemEvent setGiftWallModel(GiftWallModel giftWallModel) {
+        this.giftWallModel = giftWallModel;
+        return this;
+    }
+
+    public boolean isUnlit() {
+        return unlit;
+    }
+
+    public GiftWallItemEvent setUnlit(boolean unlit) {
+        this.unlit = unlit;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/event/LiveGiftDialogEvent.java

@@ -1,4 +1,4 @@
-package com.yunbao.live.event;
+package com.yunbao.common.event;
 
 public class LiveGiftDialogEvent {
 }

common/src/main/java/com/yunbao/common/fragment/AllServiceChampionFragment.java

@@ -0,0 +1,73 @@
+package com.yunbao.common.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.fragment.app.FragmentTransaction;
+
+import com.yunbao.common.R;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+public class AllServiceChampionFragment extends BaseFragment {
+    private TextView winnerOfTheMonth, lastMonthWinner;
+    private String mStream, mLiveUid;
+    @Override
+    public View createView(LayoutInflater layoutInflater, ViewGroup viewGroup) {
+        return layoutInflater.inflate(R.layout.fragment_all_service_champion, viewGroup, false);
+    }
+
+    @Override
+    protected void initVariables(Bundle bundle) {
+        mStream = bundle.getString("mStream");
+        mLiveUid = bundle.getString("mLiveUid");
+    }
+
+    @Override
+    protected void initViews(Bundle savedInstanceState, View contentView) {
+        winnerOfTheMonth = contentView.findViewById(R.id.winner_of_the_month);
+        lastMonthWinner = contentView.findViewById(R.id.last_month_winner);
+        winnerOfTheMonth.setSelected(true);
+        lastMonthWinner.setSelected(false);
+
+        FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+        transaction.replace(R.id.context_layout_gift, CurrentMonthGiftNamingFragment.newInstance(mStream, mLiveUid));
+        transaction.commit();
+        ViewClicksAntiShake.clicksAntiShake(winnerOfTheMonth, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                winnerOfTheMonth.setSelected(true);
+                lastMonthWinner.setSelected(false);
+
+                FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+                transaction.replace(R.id.context_layout_gift, CurrentMonthGiftNamingFragment.newInstance(mStream, mLiveUid));
+                transaction.commit();
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(lastMonthWinner, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                lastMonthWinner.setSelected(true);
+                winnerOfTheMonth.setSelected(false);
+                FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+                transaction.replace(R.id.context_layout_gift, LastMonthGiftNamingFragment.newInstance(mStream, mLiveUid));
+                transaction.commit();
+            }
+        });
+    }
+
+    @Override
+    protected void loadData() {
+
+    }
+    public static AllServiceChampionFragment newInstance(String mStream, String mLiveUid) {
+        AllServiceChampionFragment allServiceChampionFragment = new AllServiceChampionFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("mStream", mStream);
+        bundle.putString("mLiveUid", mLiveUid);
+        allServiceChampionFragment.setArguments(bundle);
+        return allServiceChampionFragment;
+    }
+}

common/src/main/java/com/yunbao/common/fragment/CurrentMonthGiftNamingFragment.java

@@ -0,0 +1,79 @@
+package com.yunbao.common.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.adapter.MonthGiftNamingAdapter;
+import com.yunbao.common.bean.GiftWallModel;
+import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.http.live.LiveNetManager;
+import com.yunbao.common.utils.ToastUtil;
+
+import java.util.List;
+
+public class CurrentMonthGiftNamingFragment extends BaseFragment {
+    private String mStream, mLiveUid;
+    private RecyclerView giftList;
+    private MonthGiftNamingAdapter monthGiftNamingAdapter;
+    private View noData;
+
+    @Override
+    public View createView(LayoutInflater layoutInflater, ViewGroup viewGroup) {
+        return layoutInflater.inflate(R.layout.fragment_current_month_gift_naming, viewGroup, false);
+    }
+
+
+    @Override
+    protected void initVariables(Bundle bundle) {
+        mStream = bundle.getString("mStream");
+        mLiveUid = bundle.getString("mLiveUid");
+    }
+
+    @Override
+    protected void initViews(Bundle savedInstanceState, View contentView) {
+        giftList = contentView.findViewById(R.id.gift_list);
+        noData = contentView.findViewById(R.id.no_data);
+        monthGiftNamingAdapter = new MonthGiftNamingAdapter();
+        giftList.setLayoutManager(new GridLayoutManager(getContext(), 3, GridLayoutManager.VERTICAL, false));
+        giftList.setAdapter(monthGiftNamingAdapter);
+    }
+
+    @Override
+    protected void loadData() {
+        LiveNetManager.get(getContext()).
+                currentMonthGiftNaming(new HttpCallback<List<GiftWallModel>>() {
+                    @Override
+                    public void onSuccess(List<GiftWallModel> data) {
+                        if (data.size() > 0) {
+                            giftList.setVisibility(View.VISIBLE);
+                            noData.setVisibility(View.GONE);
+                            monthGiftNamingAdapter.addAllData(data);
+                        } else {
+                            giftList.setVisibility(View.GONE);
+                            noData.setVisibility(View.VISIBLE);
+
+                        }
+                    }
+
+                    @Override
+                    public void onError(String error) {
+                        ToastUtil.show(error);
+                    }
+                });
+    }
+
+    public static CurrentMonthGiftNamingFragment newInstance(String mStream, String mLiveUid) {
+        CurrentMonthGiftNamingFragment currentMonthGiftNamingFragment = new CurrentMonthGiftNamingFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("mStream", mStream);
+        bundle.putString("mLiveUid", mLiveUid);
+        currentMonthGiftNamingFragment.setArguments(bundle);
+        return currentMonthGiftNamingFragment;
+    }
+}

common/src/main/java/com/yunbao/common/fragment/GiftWithoutWallFragment.java

@@ -0,0 +1,81 @@
+package com.yunbao.common.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.adapter.GiftWithoutWallAdapter;
+import com.yunbao.common.bean.GiftAlreadyWallModel;
+import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.http.live.LiveNetManager;
+
+/**
+ * wei点亮礼物墙
+ */
+public class GiftWithoutWallFragment extends BaseFragment {
+    private String mStream, mLiveUid, toUid;
+    private RecyclerView withoutList;
+    private LinearLayout giftWallNoData;
+    private GiftWithoutWallAdapter withoutWallAdapter;
+
+    @Override
+    public View createView(LayoutInflater layoutInflater, ViewGroup viewGroup) {
+        return layoutInflater.inflate(R.layout.fragment_gift_without_wall, viewGroup, false);
+    }
+
+
+    @Override
+    protected void initVariables(Bundle bundle) {
+        mStream = bundle.getString("mStream");
+        mLiveUid = bundle.getString("mLiveUid");
+        toUid = bundle.getString("toUid");
+    }
+
+    @Override
+    protected void initViews(Bundle savedInstanceState, View contentView) {
+        withoutList = contentView.findViewById(R.id.without_list);
+        giftWallNoData = contentView.findViewById(R.id.gift_wall_no_data);
+        withoutWallAdapter = new GiftWithoutWallAdapter();
+        withoutList.setLayoutManager(new GridLayoutManager(getContext(), 3, GridLayoutManager.VERTICAL, false));
+        withoutList.setAdapter(withoutWallAdapter);
+    }
+
+    @Override
+    protected void loadData() {
+        LiveNetManager.get(getActivity()).
+                giftWithoutWall(mLiveUid, toUid, new HttpCallback<GiftAlreadyWallModel>() {
+                    @Override
+                    public void onSuccess(GiftAlreadyWallModel data) {
+                        if (data.getGiftWall().size() > 0) {
+                            giftWallNoData.setVisibility(View.GONE);
+                            withoutList.setVisibility(View.VISIBLE);
+                            withoutWallAdapter.addAllData(data.getGiftWall());
+                        } else {
+                            giftWallNoData.setVisibility(View.VISIBLE);
+                            withoutList.setVisibility(View.GONE);
+                        }
+                    }
+
+                    @Override
+                    public void onError(String error) {
+
+                    }
+                });
+    }
+
+    public static GiftWithoutWallFragment newInstance(String mStream, String mLiveUid, String toUid) {
+        GiftWithoutWallFragment liveGiftFragment = new GiftWithoutWallFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("mStream", mStream);
+        bundle.putString("mLiveUid", mLiveUid);
+        bundle.putString("toUid", toUid);
+        liveGiftFragment.setArguments(bundle);
+        return liveGiftFragment;
+    }
+}

common/src/main/java/com/yunbao/common/fragment/LastMonthGiftNamingFragment.java

@@ -0,0 +1,79 @@
+package com.yunbao.common.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.adapter.MonthGiftNamingAdapter;
+import com.yunbao.common.bean.GiftWallModel;
+import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.http.live.LiveNetManager;
+import com.yunbao.common.utils.ToastUtil;
+
+import java.util.List;
+
+public class LastMonthGiftNamingFragment extends BaseFragment {
+    private String mStream, mLiveUid;
+    private RecyclerView giftList;
+    private MonthGiftNamingAdapter monthGiftNamingAdapter;
+    private View noData;
+
+    @Override
+    public View createView(LayoutInflater layoutInflater, ViewGroup viewGroup) {
+        return layoutInflater.inflate(R.layout.fragment_last_month_gift_naming, viewGroup, false);
+    }
+
+
+    @Override
+    protected void initVariables(Bundle bundle) {
+        mStream = bundle.getString("mStream");
+        mLiveUid = bundle.getString("mLiveUid");
+    }
+
+    @Override
+    protected void initViews(Bundle savedInstanceState, View contentView) {
+        giftList = contentView.findViewById(R.id.gift_list);
+        noData = contentView.findViewById(R.id.no_data);
+        monthGiftNamingAdapter = new MonthGiftNamingAdapter();
+        giftList.setLayoutManager(new GridLayoutManager(getContext(), 3, GridLayoutManager.VERTICAL, false));
+        giftList.setAdapter(monthGiftNamingAdapter);
+    }
+
+    @Override
+    protected void loadData() {
+        LiveNetManager.get(getContext()).
+                lastMonthGiftNaming(new HttpCallback<List<GiftWallModel>>() {
+                    @Override
+                    public void onSuccess(List<GiftWallModel> data) {
+                        if (data.size() > 0) {
+                            giftList.setVisibility(View.VISIBLE);
+                            noData.setVisibility(View.GONE);
+                            monthGiftNamingAdapter.addAllData(data);
+                        } else {
+                            giftList.setVisibility(View.GONE);
+                            noData.setVisibility(View.VISIBLE);
+
+                        }
+                    }
+
+                    @Override
+                    public void onError(String error) {
+                        ToastUtil.show(error);
+                    }
+                });
+    }
+
+    public static LastMonthGiftNamingFragment newInstance(String mStream, String mLiveUid) {
+        LastMonthGiftNamingFragment lastMonthGiftNamingFragment = new LastMonthGiftNamingFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("mStream", mStream);
+        bundle.putString("mLiveUid", mLiveUid);
+        lastMonthGiftNamingFragment.setArguments(bundle);
+        return lastMonthGiftNamingFragment;
+    }
+}

common/src/main/java/com/yunbao/common/glide/ImgLoader.java

@@ -336,6 +336,18 @@ public class ImgLoader {
         builder.into(imageView);
     }
 
+    public static void displayBlurLive(Context context, int url, ImageView imageView) {
+        if (!contextIsExist(context)) {
+            return;
+        }
+        RequestBuilder<Drawable> builder = Glide.with(context)
+                .load(url)
+                .thumbnail(thumbnail)
+                .apply(RequestOptions.bitmapTransform(new BlurTransformation(20)))
+                .placeholder(R.mipmap.live_bg);
+        builder.into(imageView);
+    }
+
     private static boolean contextIsExist(Context context) {
         if (context == null) {
             return false;

common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java

@@ -19,13 +19,13 @@ import com.yunbao.common.bean.ConfigBean;
 import com.yunbao.common.event.FollowEvent;
 import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.manager.APKManager;
+import com.yunbao.common.manager.GiftQuantityManager;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.LiveClassManager;
 import com.yunbao.common.manager.NewLevelManager;
 import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.L;
-import com.yunbao.common.utils.MD5Util;
 import com.yunbao.common.utils.SpUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.VersionUtil;
@@ -231,6 +231,10 @@ public class CommonHttpUtil {
                                 if (obj.containsKey("defaultBubbleUrl")) {
                                     IMLoginManager.get(context).setDefaultBubbleUrl(obj.getString("defaultBubbleUrl"));
                                 }
+                                if (obj.containsKey("gift_quantity")) {
+                                    JSONArray giftQuantity = obj.getJSONArray("gift_quantity");
+                                    new GiftQuantityManager(context).UpGiftQuantity(giftQuantity.toJSONString());
+                                }
                             } catch (Exception e) {
                                 e.printStackTrace();
                                 String error = "info[0]:" + info[0] + "\n\n\n" + "Exception:" + e.getClass() + "---message--->" + e.getMessage();

common/src/main/java/com/yunbao/common/http/PDLiveApi.java

@@ -12,6 +12,10 @@ import com.yunbao.common.bean.CustomSidebarInfoModel;
 import com.yunbao.common.bean.DiscountsModel;
 import com.yunbao.common.bean.EnterRoomNewModel;
 import com.yunbao.common.bean.FaceBookUpModel;
+import com.yunbao.common.bean.GiftAlreadyWallModel;
+import com.yunbao.common.bean.GiftGuideModel;
+import com.yunbao.common.bean.GiftWallGiftDetail;
+import com.yunbao.common.bean.GiftWallModel;
 import com.yunbao.common.bean.HourRank;
 import com.yunbao.common.bean.HttpCallbackModel;
 import com.yunbao.common.bean.IMLoginModel;
@@ -27,6 +31,7 @@ import com.yunbao.common.bean.LiveRoomVoteModel;
 import com.yunbao.common.bean.LiveStetUpStatusModel;
 import com.yunbao.common.bean.LiveTaskModel;
 import com.yunbao.common.bean.LiveUserMailBoxModel;
+import com.yunbao.common.bean.MedalAchievementModel;
 import com.yunbao.common.bean.MsgSwitchDetailModel;
 import com.yunbao.common.bean.NewPeopleInfo;
 import com.yunbao.common.bean.NobleRankHideUserListModel;
@@ -845,4 +850,69 @@ public interface PDLiveApi {
     Observable<ResponseModel<Object>> setSystemUserAvatar(
             @Query("avatar_id") int id
     );
+
+    /**
+     * 礼物墙已点亮
+     */
+    @GET("/api/public/?service=Gift.giftAlreadyWall")
+    Observable<ResponseModel<GiftAlreadyWallModel>> giftAlreadyWall(
+            @Query("liveuid") String liveUid,
+            @Query("to_uid") String toUid
+    );
+
+    /**
+     * 礼物墙未点亮
+     */
+    @GET("/api/public/?service=Gift.giftWithoutWall")
+    Observable<ResponseModel<GiftAlreadyWallModel>> giftWithoutWall(
+            @Query("liveuid") String liveUid,
+            @Query("to_uid") String toUid
+    );
+
+    /**
+     * 礼物墙选中礼物详情
+     */
+    @GET("/api/public/?service=Gift.giftDetail")
+    Observable<ResponseModel<GiftWallGiftDetail>> giftDetail(
+            @Query("liveuid") String liveUid,
+            @Query("gift_id") String giftId
+    );
+
+    /**
+     * 礼物墙本月冠名礼物
+     *
+     * @return
+     */
+    @GET("/api/public/?service=Gift.currentMonthGiftNaming")
+    Observable<ResponseModel<List<GiftWallModel>>> currentMonthGiftNaming();
+
+    /**
+     * 礼物墙上月冠名
+     *
+     * @return
+     */
+    @GET("/api/public/?service=Gift.lastMonthGiftNaming")
+    Observable<ResponseModel<List<GiftWallModel>>> lastMonthGiftNaming();
+
+    /**
+     * 礼物墙上月冠名
+     *
+     * @return
+     */
+    @GET("/api/public/?service=Gift.getGiftGuide")
+    Observable<ResponseModel<List<GiftGuideModel>>> getGiftGuide(
+            @Query("liveuid") String liveUid
+    );
+
+    @GET("/api/public/?service=Gift.getGiftGuideHistory")
+    Observable<ResponseModel<List<GiftGuideModel>>> getGiftGuideHistory(
+            @Query("liveuid") String liveUid
+    );
+
+    @GET("/api/public/?service=Gift.getUserMedalList")
+    Observable<ResponseModel<MedalAchievementModel>> getUserMedalList(@Query("to_uid") String toUid);
+
+    @GET("/api/public/?service=Gift.getLiveMedalList")
+    Observable<ResponseModel<MedalAchievementModel>> getLiveMedalList( @Query("liveuid") String liveUid);
+
 }

common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java

@@ -13,6 +13,10 @@ import com.yunbao.common.bean.CheckLiveModel;
 import com.yunbao.common.bean.CustomSidebarInfoModel;
 import com.yunbao.common.bean.DiscountsModel;
 import com.yunbao.common.bean.EnterRoomNewModel;
+import com.yunbao.common.bean.GiftAlreadyWallModel;
+import com.yunbao.common.bean.GiftGuideModel;
+import com.yunbao.common.bean.GiftWallGiftDetail;
+import com.yunbao.common.bean.GiftWallModel;
 import com.yunbao.common.bean.HttpCallbackModel;
 import com.yunbao.common.bean.LinkMicUserBean;
 import com.yunbao.common.bean.LinkMicUserBeanV2;
@@ -27,6 +31,7 @@ import com.yunbao.common.bean.LiveRoomVoteModel;
 import com.yunbao.common.bean.LiveStetUpStatusModel;
 import com.yunbao.common.bean.LiveTaskModel;
 import com.yunbao.common.bean.LiveUserMailBoxModel;
+import com.yunbao.common.bean.MedalAchievementModel;
 import com.yunbao.common.bean.NobleRankHideUserListModel;
 import com.yunbao.common.bean.NobleTrumpetModel;
 import com.yunbao.common.bean.PkRankBean;
@@ -59,6 +64,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
+import retrofit2.http.Query;
 
 
 /**
@@ -1842,6 +1848,205 @@ public class LiveNetManager {
                     }
                 }).isDisposed();
     }
+
+    public void giftAlreadyWall(String liveUid, String toUid, HttpCallback<GiftAlreadyWallModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .giftAlreadyWall(liveUid, toUid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<GiftAlreadyWallModel>>() {
+                    @Override
+                    public void accept(ResponseModel<GiftAlreadyWallModel> giftAlreadyWallModelResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(giftAlreadyWallModelResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void giftWithoutWall(String liveUid, String toUid, HttpCallback<GiftAlreadyWallModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .giftWithoutWall(liveUid, toUid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<GiftAlreadyWallModel>>() {
+                    @Override
+                    public void accept(ResponseModel<GiftAlreadyWallModel> giftAlreadyWallModelResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(giftAlreadyWallModelResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void giftDetail(String liveUid, String giftId, HttpCallback<GiftWallGiftDetail> callback) {
+        API.get().pdLiveApi(mContext)
+                .giftDetail(liveUid, giftId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<GiftWallGiftDetail>>() {
+                    @Override
+                    public void accept(ResponseModel<GiftWallGiftDetail> giftWallGiftDetailResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(giftWallGiftDetailResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void currentMonthGiftNaming(HttpCallback<List<GiftWallModel>> callback) {
+        API.get().pdLiveApi(mContext)
+                .currentMonthGiftNaming()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<List<GiftWallModel>>>() {
+                    @Override
+                    public void accept(ResponseModel<List<GiftWallModel>> listResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(listResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void lastMonthGiftNaming(HttpCallback<List<GiftWallModel>> callback) {
+        API.get().pdLiveApi(mContext)
+                .lastMonthGiftNaming()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<List<GiftWallModel>>>() {
+                    @Override
+                    public void accept(ResponseModel<List<GiftWallModel>> listResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(listResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void getGiftGuide(String liveUid, HttpCallback<List<GiftGuideModel>> callback) {
+        API.get().pdLiveApi(mContext)
+                .getGiftGuide(liveUid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<List<GiftGuideModel>>>() {
+                    @Override
+                    public void accept(ResponseModel<List<GiftGuideModel>> listResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(listResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void getGiftGuideHistory(String liveUid, HttpCallback<List<GiftGuideModel>> callback) {
+        API.get().pdLiveApi(mContext)
+                .getGiftGuideHistory(liveUid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<List<GiftGuideModel>>>() {
+                    @Override
+                    public void accept(ResponseModel<List<GiftGuideModel>> listResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(listResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void getUserMedalList(String toUid, HttpCallback<MedalAchievementModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .getUserMedalList(toUid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<MedalAchievementModel>>() {
+                    @Override
+                    public void accept(ResponseModel<MedalAchievementModel> listResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(listResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void getLiveMedalList( String liveUid,HttpCallback<MedalAchievementModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .getLiveMedalList(liveUid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<MedalAchievementModel>>() {
+                    @Override
+                    public void accept(ResponseModel<MedalAchievementModel> listResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(listResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
     /**
      * 直播间取消网络请求
      */

common/src/main/java/com/yunbao/common/manager/GiftQuantityManager.java

@@ -0,0 +1,53 @@
+package com.yunbao.common.manager;
+
+import android.content.Context;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.yunbao.common.bean.GiftQuantityModel;
+import com.yunbao.common.bean.LiveClassBean;
+import com.yunbao.common.manager.base.BaseCacheManager;
+
+import java.util.List;
+
+public class GiftQuantityManager extends BaseCacheManager {
+    private final static String KEY_GIFT_QUANTITY = "GiftQuantity";
+    private static GiftQuantityManager manager;
+    private Context context;
+    private List<GiftQuantityModel> giftQuantityModels;
+
+    public GiftQuantityManager(Context context) {
+        super(context);
+    }
+
+    /**
+     * 获取指导员备注信息
+     *
+     * @return
+     */
+    public List<GiftQuantityModel> getGiftQuantity() {
+        List<GiftQuantityModel> giftQuantityModels = getList(KEY_GIFT_QUANTITY, new TypeToken<List<GiftQuantityModel>>() {
+        }.getType());
+        if (giftQuantityModels == null || giftQuantityModels.size() == 0) {
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("1").setFontColour("#ffffff"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("10").setFontColour("#ffffff"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("66").setFontColour("#ffffff"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("88").setFontColour("#FA62A1"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("100").setFontColour("#9B62FF"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("520").setFontColour("#65BFFB"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("1314").setFontColour("#05F3EC"));
+        }
+        return giftQuantityModels;
+    }
+
+    /**
+     * 缓存等级图标
+     *
+     * @param json
+     */
+    public void UpGiftQuantity(String json) {
+        giftQuantityModels = new Gson().fromJson(json, new TypeToken<List<GiftQuantityModel>>() {
+        }.getType());
+        put(KEY_GIFT_QUANTITY, giftQuantityModels);
+    }
+}

common/src/main/java/com/yunbao/common/manager/RandomPkManager.java

@@ -401,7 +401,7 @@ public class RandomPkManager {
      * 清空状态，下播时调用
      */
     public void release() {
-        status = PK_STATUS_REQUEST;
+        status = PK_STATUS_DEFAULT;
         if (task != null) {
             task.cancel();
         }

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

@@ -0,0 +1,56 @@
+package com.yunbao.common.utils;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.renderscript.Allocation;
+import android.renderscript.Element;
+import android.renderscript.RenderScript;
+import android.renderscript.ScriptIntrinsicBlur;
+
+/**
+ * Created by L on 2017/10/12.
+ */
+
+public class BlurBitmapUtil {
+    /**
+     * 图片缩放比例
+     */
+    private static final float BITMAP_SCALE = 0.4f;
+    /**
+     * 最大模糊度(在0.0到25.0之间)
+     */
+    private static final float BLUR_RADIUS = 25f;
+    /**
+     * 模糊图片的具体方法
+     *
+     * @param context   上下文对象
+     * @param image     需要模糊的图片
+     * @return          模糊处理后的图片
+     */
+    public static Bitmap blur(Context context, Bitmap image) {
+        // 计算图片缩小后的长宽
+        int width = Math.round(image.getWidth() * BITMAP_SCALE);
+        int height = Math.round(image.getHeight() * BITMAP_SCALE);
+        // 将缩小后的图片做为预渲染的图片。
+        Bitmap inputBitmap = Bitmap.createScaledBitmap(image, width, height, false);
+        // 创建一张渲染后的输出图片。
+        Bitmap outputBitmap = Bitmap.createBitmap(inputBitmap);
+        // 创建RenderScript内核对象
+        RenderScript rs = RenderScript.create(context);
+        // 创建一个模糊效果的RenderScript的工具对象
+        ScriptIntrinsicBlur blurScript = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs));
+        // 由于RenderScript并没有使用VM来分配内存,所以需要使用Allocation类来创建和分配内存空间。
+        // 创建Allocation对象的时候其实内存是空的,需要使用copyTo()将数据填充进去。
+        Allocation tmpIn = Allocation.createFromBitmap(rs, inputBitmap);
+        Allocation tmpOut = Allocation.createFromBitmap(rs, outputBitmap);
+        // 设置渲染的模糊程度, 25f是最大模糊度
+        blurScript.setRadius(BLUR_RADIUS);
+        // 设置blurScript对象的输入内存
+        blurScript.setInput(tmpIn);
+        // 将输出数据保存到输出内存中
+        blurScript.forEach(tmpOut);
+        // 将数据填充到Allocation中
+        tmpOut.copyTo(outputBitmap);
+        return outputBitmap;
+    }
+}

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

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

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

@@ -35,6 +35,7 @@ public class RouteUtil {
     public static final String PATH_MAIN = "/main/MainActivity";
     public static final String PATH_ENTRY = "/main/EntryActivity";
     public static final String PATH_LIVE_AUDIENCE = "/live/LiveAudienceActivity";
+    public static final String PATH_GIFT_WALL = "/live/GiftWallActivity";
     public static final String PATH_SETTING = "/main/SettingActivity";
     public static final String PATH_FANSACTIVITY = "/main/FansActivity";
     public static final String PATH_MYWEBVIEWACTIVTITY2 = "/main/MyWebViewActivity2";
@@ -233,6 +234,15 @@ public class RouteUtil {
         postcard.navigation();
     }
 
+    public static void forwardGiftWallActivity(String mStream, String mAnchorName, String mLiveUid, String mAvatarUrl, int isAttention) {
+        ARouter.getInstance().build(PATH_GIFT_WALL)
+                .withString(Constants.LIVE_UID, mLiveUid)
+                .withString(Constants.STREAM, mStream)
+                .withString("mAnchorName", mAnchorName)
+                .withString("mAvatarUrl", mAvatarUrl)
+                .withInt("isAttention", isAttention)
+                .navigation();
+    }
 
     /**
      * 举报个人
@@ -288,6 +298,7 @@ public class RouteUtil {
 
     /**
      * 红包发放情况
+     *
      * @param id 发放者uid
      */
     public static void forwardRedPacketUser(int id) {

common/src/main/java/com/yunbao/common/views/AchievementDetailsViewHolder.java

@@ -0,0 +1,22 @@
+package com.yunbao.common.views;
+
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.UserMedalModel;
+import com.yunbao.common.glide.ImgLoader;
+
+public class AchievementDetailsViewHolder extends RecyclerView.ViewHolder {
+   private ImageView achievementImg;
+    public AchievementDetailsViewHolder(@NonNull View itemView) {
+        super(itemView);
+       achievementImg = itemView.findViewById(R.id.achievement_img);
+    }
+    public void showData(UserMedalModel userMedalModel){
+        ImgLoader.display(itemView.getContext(), userMedalModel.getDisplaySrc(), achievementImg);
+    }
+}

common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java

@@ -139,7 +139,7 @@ public class CustomDrawerPopupView extends DrawerPopupView {
         ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.online), new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
-                XPopup.Builder builder = new XPopup.Builder(getContext()).atView(findViewById(R.id.more_menu));
+                XPopup.Builder builder = new XPopup.Builder(getContext()).atView(findViewById(R.id.diamond_linear));
                 builder.hasShadowBg(false)
                         .isDestroyOnDismiss(true)
                         .isLightStatusBar(false)

common/src/main/java/com/yunbao/common/views/GiftAlreadyWallViewHolder.java

@@ -0,0 +1,37 @@
+package com.yunbao.common.views;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.GiftWallModel;
+import com.yunbao.common.event.GiftWallItemEvent;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+public class GiftAlreadyWallViewHolder extends RecyclerView.ViewHolder {
+    private ImageView giftImg;
+    private TextView giftTitle;
+
+    public GiftAlreadyWallViewHolder(@NonNull View itemView) {
+        super(itemView);
+        giftImg = itemView.findViewById(R.id.gift_img);
+        giftTitle = itemView.findViewById(R.id.gift_title);
+    }
+
+    public void showData(GiftWallModel giftWallModel) {
+        giftTitle.setText(giftWallModel.getGiftname());
+        ImgLoader.display(itemView.getContext(), giftWallModel.getGifticon(), giftImg);
+        ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                Bus.get().post(new GiftWallItemEvent().setGiftWallModel(giftWallModel).setUnlit(true));
+            }
+        });
+    }
+}

common/src/main/java/com/yunbao/common/views/GiftNumber.java

@@ -0,0 +1,34 @@
+package com.yunbao.common.views;
+
+import android.graphics.Color;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.GiftQuantityModel;
+import com.yunbao.common.event.GiftNumberEvent;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+public class GiftNumber extends RecyclerView.ViewHolder {
+    private TextView customQuantity;
+
+    public GiftNumber(@NonNull View itemView) {
+        super(itemView);
+        customQuantity = itemView.findViewById(R.id.custom_quantity);
+    }
+
+    public void showData(GiftQuantityModel quantityModel) {
+        customQuantity.setText(quantityModel.getGiftQuantity());
+        customQuantity.setTextColor(Color.parseColor(quantityModel.getFontColour()));
+        ViewClicksAntiShake.clicksAntiShake(customQuantity, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                Bus.get().post(new GiftNumberEvent().setmCount(quantityModel.getGiftQuantity()));
+            }
+        });
+    }
+}

common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java

@@ -0,0 +1,59 @@
+package com.yunbao.common.views;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.lxj.xpopup.core.BottomPopupView;
+import com.yunbao.common.R;
+import com.yunbao.common.adapter.GiftNumberAdapter;
+import com.yunbao.common.event.GiftNumberEvent;
+import com.yunbao.common.manager.GiftQuantityManager;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+public class GiftNumberPopup extends BottomPopupView {
+    public GiftNumberPopup(@NonNull Context context) {
+        super(context);
+    }
+
+    // 返回自定义弹窗的布局
+    @Override
+    protected int getImplLayoutId() {
+        return R.layout.view_live_gift_number;
+    }
+
+    // 执行初始化操作，比如：findView，设置点击，或者任何你弹窗内的业务逻辑
+    @Override
+    protected void onCreate() {
+        Bus.getOn(this);
+        super.onCreate();
+        RecyclerView giftList = findViewById(R.id.gift_list);
+        giftList.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
+        GiftNumberAdapter giftNumberAdapter = new GiftNumberAdapter(new GiftQuantityManager(getContext()).getGiftQuantity());
+        giftList.setAdapter(giftNumberAdapter);
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.to_can), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                dismiss();
+            }
+        });
+    }
+
+    @Override
+    protected void onDismiss() {
+        super.onDismiss();
+        Bus.getOff(this);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onGiftNumberEvent(GiftNumberEvent event) {
+        dismiss();
+    }
+
+}

common/src/main/java/com/yunbao/common/views/GiftWithoutWallViewHolder.java

@@ -0,0 +1,37 @@
+package com.yunbao.common.views;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.GiftWallModel;
+import com.yunbao.common.event.GiftWallItemEvent;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+public class GiftWithoutWallViewHolder extends RecyclerView.ViewHolder {
+    private ImageView giftImg;
+    private TextView giftTitle;
+
+    public GiftWithoutWallViewHolder(@NonNull View itemView) {
+        super(itemView);
+        giftImg = itemView.findViewById(R.id.gift_img);
+        giftTitle = itemView.findViewById(R.id.gift_title);
+    }
+
+    public void showData(GiftWallModel giftWallModel) {
+        giftTitle.setText(giftWallModel.getGiftname());
+        ImgLoader.display(itemView.getContext(), giftWallModel.getGifticon(), giftImg);
+        ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                Bus.get().post(new GiftWallItemEvent().setGiftWallModel(giftWallModel).setUnlit(false));
+            }
+        });
+    }
+}

common/src/main/java/com/yunbao/common/views/MedalAchievementViewHolder.java

@@ -0,0 +1,48 @@
+package com.yunbao.common.views;
+
+import android.graphics.Color;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.lxj.xpopup.XPopup;
+import com.yunbao.common.R;
+import com.yunbao.common.bean.UserMedalListModel;
+import com.yunbao.common.dialog.AchievementDetailsPopup;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+public class MedalAchievementViewHolder extends RecyclerView.ViewHolder {
+    private ImageView achievementImg;
+    private TextView giftWall;
+
+    public MedalAchievementViewHolder(@NonNull View itemView) {
+        super(itemView);
+        achievementImg = itemView.findViewById(R.id.achievement_img);
+        giftWall = itemView.findViewById(R.id.gift_wall);
+    }
+
+    public void showData(UserMedalListModel userMedalListModel) {
+        if (TextUtils.equals(userMedalListModel.getDressStatus(), "1")) {
+            ImgLoader.display(itemView.getContext(), userMedalListModel.getDisplaySrc(), achievementImg);
+            giftWall.setTextColor(Color.parseColor("#6F43FF"));
+        } else {
+            ImgLoader.display(itemView.getContext(), userMedalListModel.getDisplaySrcSecond(), achievementImg);
+            giftWall.setTextColor(Color.parseColor("#53408F"));
+        }
+        giftWall.setText(userMedalListModel.getDressName());
+        ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                new XPopup.Builder(itemView.getContext())
+                        .enableDrag(false)
+                        .asCustom(new AchievementDetailsPopup(itemView.getContext(),  userMedalListModel))
+                        .show();
+            }
+        });
+    }
+}

common/src/main/java/com/yunbao/common/views/MonthGiftNamingViewHolder.java

@@ -0,0 +1,35 @@
+package com.yunbao.common.views;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.GiftWallModel;
+import com.yunbao.common.glide.ImgLoader;
+
+public class MonthGiftNamingViewHolder extends RecyclerView.ViewHolder {
+    private ImageView giftImg, avatar;
+    private TextView giftTitle, namingCoin, userName;
+
+    public MonthGiftNamingViewHolder(@NonNull View itemView) {
+        super(itemView);
+        giftImg = itemView.findViewById(R.id.gift_img);
+        avatar = itemView.findViewById(R.id.avatar);
+        giftTitle = itemView.findViewById(R.id.gift_title);
+        namingCoin = itemView.findViewById(R.id.naming_coin);
+        userName = itemView.findViewById(R.id.user_name);
+    }
+
+    public void showData(GiftWallModel giftWallModel) {
+        giftTitle.setText(giftWallModel.getGiftname());
+        namingCoin.setText(giftWallModel.getNamingCoinMax());
+        userName.setText(giftWallModel.getUserNicename());
+        ImgLoader.display(itemView.getContext(), giftWallModel.getGifticon(), giftImg);
+        ImgLoader.display(itemView.getContext(), giftWallModel.getAvatar(), avatar);
+
+    }
+}

common/src/main/java/com/yunbao/common/views/weight/ViewClicksAntiShake.java

@@ -8,7 +8,7 @@ import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;
-import kotlin.*;
+import kotlin.Unit;
 
 /**
  * View防抖

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp" />
+    <gradient
+        android:angle="90"
+        android:endColor="#000000"
+        android:startColor="#9000" />
+</shape>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="90"
+        android:endColor="#F2D1FF"
+        android:startColor="#87ACFF" />
+    <corners android:radius="6dp" />
+</shape>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="false">
+        <shape>
+            <gradient android:angle="90" android:startColor="#BBD3FF" android:endColor="#E6EEFF" />
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+    <item android:state_selected="true">
+        <shape>
+            <gradient android:angle="90" android:startColor="#FF7917" android:endColor="#FCD16E" />
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+</selector>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners
+        android:bottomRightRadius="10dp"
+        android:topLeftRadius="10dp" />
+</shape>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners
+        android:topLeftRadius="15dp"
+        android:topRightRadius="15dp" />
+</shape>

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

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

common/src/main/res/drawable/background_gift_money.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="17dp" />
+    <solid android:color="#2A2C3B" />
+</shape>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:bottomLeftRadius="16dp"
+        android:topLeftRadius="16dp" />
+    <solid android:color="#2A2C3B" />
+</shape>

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

@@ -0,0 +1,11 @@
+<?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="8dp" />
+            <solid android:color="#130F25" />
+            <stroke android:width="0.6dp" android:color="#AEAEB2" />
+        </shape>
+    </item>
+
+</selector>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="false">
+        <shape android:shape="rectangle">
+            <corners android:radius="6dp" />
+            <solid android:color="#FFFFFF" />
+        </shape>
+    </item>
+    <item android:state_selected="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="6dp" />
+            <solid android:color="#F0DBFF" />
+        </shape>
+    </item>
+</selector>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="90"
+        android:endColor="#FFF6FF"
+        android:startColor="#E6F3FC" />
+    <corners
+        android:topLeftRadius="15dp"
+        android:topRightRadius="15dp" />
+</shape>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true">
+        <shape>
+            <corners android:radius="18dp" />
+            <gradient android:angle="180" android:endColor="#FF7C25" android:startColor="#FFB323" />
+        </shape>
+    </item>
+    <item android:state_enabled="false">
+        <shape>
+            <corners android:radius="18dp" />
+            <solid android:color="#282518" />
+        </shape>
+    </item>
+</selector>

common/src/main/res/drawable/bg_parcel_point.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="#3B3D52"/>
+</shape>

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--设置ProgressBar背景色-->
+    <item android:id="@android:id/background">
+        <shape>
+            <!--设置ProgressBar进度条圆角半径-->
+            <corners android:radius="5dp" />
+            <solid android:color="#E6E6E6" />
+        </shape>
+    </item>
+
+    <!--设置ProgressBar进度条颜色-->
+    <item android:id="@android:id/progress">
+        <clip android:clipOrientation="horizontal">
+            <shape>
+                <corners android:radius="5dp" />
+                <solid android:color="#FFC722" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>

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

@@ -0,0 +1,14 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:gravity="center_horizontal">
+        <shape>
+            <corners android:radius="3dp" />
+            <size
+                android:width="14dp"
+                android:height="4dp" />
+            <gradient
+                android:angle="180"
+                android:endColor="#807CFF"
+                android:startColor="#A183FF" />
+        </shape>
+    </item>
+</layer-list>

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="524dp"
+    android:layout_gravity="bottom"
+    android:background="@drawable/background_dialog_live_codex"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/close_btn"
+        android:layout_width="8dp"
+        android:layout_height="14dp"
+        android:layout_margin="13dp"
+        android:src="@mipmap/icon_regular_black" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/live_codex"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
+        android:paddingBottom="15dp" />
+</LinearLayout>

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

@@ -0,0 +1,437 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <ImageView
+            android:id="@+id/operate_image"
+            android:layout_width="122dp"
+            android:layout_height="50dp"
+            android:layout_gravity="end|bottom" />
+
+        <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
+        android:id="@+id/gift_list"
+        android:layout_width="match_parent"
+        android:layout_height="351dp"
+        android:animateLayoutChanges="true"
+        android:orientation="vertical">
+
+        <com.makeramen.roundedimageview.RoundedImageView
+            android:id="@+id/git_background2"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitXY"
+            android:src="@drawable/backgroud_custom_gift2"
+            app:riv_corner_radius_bottom_left="0dp"
+            app:riv_corner_radius_bottom_right="0dp"
+            app:riv_corner_radius_top_left="10dp"
+            app:riv_corner_radius_top_right="10dp" />
+
+
+        <LinearLayout
+            android:id="@+id/git_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:animateLayoutChanges="true">
+
+            <LinearLayout
+                android:id="@+id/leveling_layout"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:visibility="gone">
+
+                <FrameLayout
+                    android:layout_width="40dp"
+                    android:layout_height="22dp"
+                    android:layout_marginStart="17dp"
+                    android:layout_marginTop="9dp"
+                    android:background="@mipmap/icon_grade_angle_mark">
+
+                    <TextView
+                        android:id="@+id/lv_str"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="Lv.8"
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
+                </FrameLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="6dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginEnd="18dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <ProgressBar
+                        android:id="@+id/progressBar"
+                        style="?android:attr/progressBarStyleHorizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="4dp"
+                        android:max="100"
+                        android:progress="0"
+                        android:progressDrawable="@drawable/progress_bg_user" />
+
+                    <TextView
+                        android:id="@+id/leave_hint"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:text="@string/leveling_points"
+                        android:textColor="#BBBBBB"
+                        android:textSize="9sp" />
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginTop="14dp"
+                    android:layout_marginEnd="14dp"
+                    android:background="@mipmap/icon_right" />
+            </LinearLayout>
+
+            <com.yunbao.common.views.weight.MarqueeTextView
+                android:id="@+id/gift_description"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="15dp"
+                android:layout_marginEnd="16dp"
+                android:layout_weight="1"
+                android:background="@drawable/background_gift_description"
+                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" />
+
+            <FrameLayout
+                android:id="@+id/btn_luck_gift_tip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp">
+
+                <include layout="@layout/view_nobility" />
+
+            </FrameLayout>
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/gift_bottom"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="17dp"
+            android:paddingStart="16dp">
+
+            <LinearLayout
+                android:id="@+id/diamond_linear"
+                android:layout_width="wrap_content"
+                android:layout_height="32dp"
+                android:background="@drawable/background_gift_money"
+                android:gravity="center_vertical"
+                android:paddingStart="4dp"
+                android:paddingTop="7dp"
+                android:paddingBottom="7dp">
+
+                <ImageView
+                    android:layout_width="18dp"
+                    android:layout_height="18dp"
+                    android:clickable="false"
+                    android:focusable="false"
+                    android:src="@mipmap/diamond" />
+
+                <TextView
+                    android:id="@+id/diamond_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"
+                    android:clickable="false"
+                    android:focusable="false"
+                    android:text="0"
+                    android:textColor="@color/white"
+                    android:textSize="12sp" />
+
+                <ImageView
+                    android:layout_width="8dp"
+                    android:layout_height="8dp"
+                    android:layout_marginEnd="4dp"
+                    android:background="@mipmap/icon_right" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/gold_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="8dp"
+                android:layout_toRightOf="@id/diamond_linear"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:clickable="false"
+                    android:focusable="false"
+                    android:src="@mipmap/gold_coin" />
+
+                <TextView
+                    android:id="@+id/gold_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"
+                    android:clickable="false"
+                    android:focusable="false"
+                    android:text="10000000"
+                    android:textColor="@color/white"
+                    android:textSize="12sp" />
+            </LinearLayout>
+
+            <FrameLayout
+                android:id="@+id/gift_send_layout"
+                android:layout_width="130dp"
+                android:layout_height="32dp"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="14dp">
+
+                <FrameLayout
+                    android:id="@+id/gift_number_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginEnd="42dp"
+                    android:background="@drawable/background_gift_money2">
+
+                    <TextView
+                        android:id="@+id/gift_number"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="15dp"
+                        android:text="1"
+                        android:textColor="#F5C05A"
+                        android:textSize="14sp" />
+
+                    <ImageView
+                        android:id="@+id/icon_arrow"
+                        android:layout_width="10dp"
+                        android:layout_height="10dp"
+                        android:layout_gravity="center_vertical|end"
+                        android:layout_marginEnd="30dp"
+                        android:src="@mipmap/icon_arrow_right_2" />
+                </FrameLayout>
+
+                <TextView
+                    android:id="@+id/live_gift_send"
+                    android:layout_width="62dp"
+                    android:layout_height="32dp"
+                    android:layout_gravity="end"
+                    android:background="@drawable/bg_live_gift_send_new"
+                    android:gravity="center"
+                    android:text="@string/live_gift_send"
+                    android:textColor="@color/white"
+                    android:textSize="14sp" />
+            </FrameLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/gift_bottom"
+            android:layout_below="@id/git_title"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="18dp">
+
+                <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1">
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/gift_title"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="8dp" />
+
+                    <ImageView
+                        android:layout_width="27dp"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="end"
+                        android:background="@drawable/icon_covering_layer"
+                        android:scaleType="centerCrop" />
+                </FrameLayout>
+
+                <View
+                    android:layout_width="1dp"
+                    android:layout_height="11dp"
+                    android:layout_gravity="center_vertical"
+                    android:background="@color/white" />
+
+                <FrameLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="6dp"
+                    android:layout_marginEnd="10dp">
+
+
+                    <TextView
+                        android:id="@+id/live_wrap"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingEnd="8dp"
+                        android:text="@string/live_wrap"
+                        android:textColor="#CCCDCE"
+                        android:textSize="16sp" />
+
+                    <View
+                        android:id="@+id/red_point"
+                        android:layout_width="6dp"
+                        android:layout_height="6dp"
+                        android:layout_gravity="end"
+                        android:layout_marginEnd="6dp"
+                        android:background="@drawable/bg_red_point" />
+                </FrameLayout>
+
+
+            </LinearLayout>
+
+            <FrameLayout
+                android:id="@+id/context_layout_gift"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="12dp" />
+
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/btn_send_lian"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginRight="10dp"
+            android:layout_marginBottom="5dp"
+            android:background="@mipmap/icon_live_gift_lian"
+            android:visibility="gone">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="20dp"
+                android:text="@string/live_gift_send_lian"
+                android:textColor="@color/white"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/lian_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="35dp"
+                android:textColor="#fff"
+                android:textSize="14sp" />
+
+        </RelativeLayout>
+
+
+    </RelativeLayout>
+
+
+</LinearLayout>

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

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp">
+
+        <TextView
+            android:id="@+id/winner_of_the_month"
+            android:layout_width="90dp"
+            android:layout_height="25dp"
+            android:layout_marginStart="55dp"
+            android:background="@drawable/background_select_all_service"
+            android:gravity="center"
+            android:text="@string/winner_of_the_month"
+            android:textColor="#FF8331"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/last_month_winner"
+            android:layout_width="90dp"
+            android:layout_height="25dp"
+            android:layout_gravity="end"
+            android:layout_marginEnd="55dp"
+            android:background="@drawable/background_select_all_service"
+            android:gravity="center"
+            android:text="@string/last_month_winner"
+            android:textColor="#FF8331"
+            android:textSize="12sp" />
+    </FrameLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="12dp"
+        android:text="@string/last_month_winner_hint"
+        android:textColor="#807CFF"
+        android:textSize="10sp" />
+
+    <FrameLayout
+        android:id="@+id/context_layout_gift"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/gift_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="5dp"
+        android:paddingTop="15dp"
+        android:paddingEnd="5dp"
+        android:paddingBottom="15dp"
+        android:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/no_data"
+        android:layout_width="140dp"
+        android:layout_height="95dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="80dp"
+        android:background="@drawable/icon_gift_wall_no_data" />
+</LinearLayout>

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

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:ignore="MissingDefaultResource">
+
+    <LinearLayout
+        android:id="@+id/gift_wall_data"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="14dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/lit_icon"
+                android:textColor="#807CFF"
+                android:textSize="13sp" />
+
+            <TextView
+                android:id="@+id/lit_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="7dp"
+                android:text="12"
+                android:textColor="#FE4311"
+                android:textSize="13sp" />
+
+            <TextView
+                android:id="@+id/gift_all"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="/49"
+                android:textColor="#807CFF"
+                android:textSize="13sp" />
+        </LinearLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/already_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/gift_wall_no_data"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="140dp"
+            android:layout_height="95dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="80dp"
+            android:background="@drawable/icon_gift_wall_no_data" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="11dp"
+            android:text="@string/unlit_icon_hint"
+            android:textColor="#99000000"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/instant_light"
+            android:layout_width="100dp"
+            android:layout_height="28dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="40dp"
+            android:background="@drawable/background_skip_button"
+            android:gravity="center"
+            android:text="@string/instant_light"
+            android:visibility="gone"
+            android:textColor="#F16D00"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/without_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="5dp"
+        android:paddingTop="15dp"
+        android:paddingEnd="5dp"
+        android:paddingBottom="15dp"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:id="@+id/gift_wall_no_data"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="140dp"
+            android:layout_height="95dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="80dp"
+            android:background="@drawable/icon_gift_wall_no_data" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="11dp"
+            android:text="@string/lit_icon_hint"
+            android:textColor="#99000000"
+            android:textSize="12sp" />
+
+    </LinearLayout>
+</LinearLayout>

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/gift_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="5dp"
+        android:paddingTop="15dp"
+        android:paddingEnd="5dp"
+        android:paddingBottom="15dp"
+        android:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/no_data"
+        android:layout_width="140dp"
+        android:layout_height="95dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="80dp"
+        android:background="@drawable/icon_gift_wall_no_data" />
+</LinearLayout>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="7dp">
+
+    <ImageView
+        android:id="@+id/achievement_img"
+        android:layout_width="40dp"
+        android:layout_height="40dp" />
+</LinearLayout>

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

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="115dp"
+    android:layout_marginTop="13dp"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/codex_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitXY" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="22dp"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/title_icon"
+                android:layout_width="47dp"
+                android:layout_height="52dp"
+                android:layout_marginTop="26dp" />
+
+            <TextView
+                android:id="@+id/title_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="7dp"
+                android:text="@string/regular_bubble"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/gift_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:padding="4dp" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/week_number"
+        android:layout_width="71dp"
+        android:layout_height="22dp"
+        android:background="@drawable/background_codex_top"
+        android:gravity="center"
+        android:textColor="#B74D0F"
+        android:textSize="14sp" />
+
+    <TextView
+        android:id="@+id/week_number2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:layout_marginTop="2dp"
+        android:layout_marginEnd="10dp"
+        android:text="@string/last_month_winner_hint2"
+        android:textColor="#B74D0F"
+        android:textSize="11sp" />
+</FrameLayout>

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/gift_img"
+        android:layout_width="43dp"
+        android:layout_height="43dp"
+        android:layout_marginTop="12dp" />
+
+    <TextView
+        android:id="@+id/gift_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/regular_bubble"
+        android:textSize="11sp" />
+
+    <TextView
+        android:id="@+id/gift_wall"
+        android:layout_width="50dp"
+        android:layout_height="20dp"
+        android:layout_marginTop="6dp"
+        android:textSize="11sp"
+        android:background="@drawable/background_codex_item_btn"
+        android:gravity="center" />
+</LinearLayout>

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="132dp"
+    android:layout_margin="5dp"
+    android:background="@mipmap/background_gift_already_wall"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/gift_img"
+        android:layout_width="65dp"
+        android:layout_height="65dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="20dp" />
+
+    <TextView
+        android:id="@+id/gift_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="9dp"
+        android:text="@string/instant_light"
+        android:textColor="#54618F"
+        android:textSize="14sp" />
+</LinearLayout>

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

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="132dp"
+    android:layout_margin="5dp"
+    android:background="@mipmap/background_gift_without_wall"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/gift_img"
+            android:layout_width="65dp"
+            android:layout_height="65dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="20dp" />
+
+        <TextView
+            android:id="@+id/gift_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="9dp"
+            android:text="@string/instant_light"
+            android:textColor="#54618F"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@mipmap/background_gift_wall_masking">
+
+        <ImageView
+            android:layout_width="22dp"
+            android:layout_height="30dp"
+            android:layout_gravity="center"
+            android:src="@mipmap/background_gift_wall_lock" />
+    </FrameLayout>
+</FrameLayout>

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="100dp">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitXY"
+            android:src="@mipmap/background_medal_achievement" />
+
+        <ImageView
+            android:id="@+id/achievement_img"
+            android:layout_width="58dp"
+            android:layout_height="53dp"
+            android:layout_gravity="center" />
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/gift_wall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="8dp"
+        android:text="@string/gift_wall"
+        android:textSize="14sp" />
+</LinearLayout>

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

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="5dp"
+    android:background="@mipmap/background_gift_already_wall"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/gift_img"
+        android:layout_width="65dp"
+        android:layout_height="65dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="6dp" />
+
+    <TextView
+        android:id="@+id/gift_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="2dp"
+        android:text="@string/instant_light"
+        android:textColor="#FFFFFF"
+        android:textSize="12sp" />
+
+    <TextView
+        android:id="@+id/naming_coin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="2dp"
+        android:text="@string/instant_light"
+        android:textColor="#FFFFFF"
+        android:textSize="14sp" />
+a
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_marginStart="9dp"
+        android:layout_marginEnd="9dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="9dp"
+        android:gravity="center_vertical"
+        android:paddingBottom="5dp">
+
+        <com.makeramen.roundedimageview.RoundedImageView
+            android:id="@+id/avatar"
+            android:layout_width="19dp"
+            android:layout_height="19dp"
+            android:scaleType="centerCrop"
+            android:src="@drawable/m_chu_xia"
+            app:riv_oval="true" />
+
+        <TextView
+            android:id="@+id/user_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginStart="4dp"
+            android:text="@string/instant_light"
+            android:textColor="#4F00F9"
+            android:textSize="11sp" />
+    </LinearLayout>
+</LinearLayout>

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

@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/layout"
+    android:layout_width="match_parent"
+    android:layout_height="315dp"
+    android:orientation="vertical"
+    app:cardCornerRadius="10dp"
+    app:cardElevation="0dp">
+
+    <LinearLayout
+        android:id="@+id/hava_data_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="39dp"
+            android:text="@string/achievement_details"
+            android:textColor="#6F43FF"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <FrameLayout
+            android:layout_width="90dp"
+            android:layout_height="100dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="23dp"
+            android:background="@mipmap/background_medal_achievement">
+
+            <ImageView
+                android:id="@+id/achievement_img"
+                android:layout_width="65dp"
+                android:layout_height="51dp"
+                android:layout_gravity="center" />
+        </FrameLayout>
+
+        <TextView
+            android:id="@+id/dress_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="8dp"
+            android:text="@string/regular_bubble"
+            android:textColor="#6F43FF"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/dress_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="15dp"
+            android:gravity="center"
+            android:text="@string/regular_bubble"
+            android:textColor="#6F43FF"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/gift_details_btn"
+            android:layout_width="100dp"
+            android:layout_height="28dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="16dp"
+            android:background="@drawable/background_skip_button"
+            android:gravity="center"
+            android:text="@string/aristocrat_determine"
+            android:textColor="#F16D00"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/hava_data"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="13dp"
+            android:text="@string/achievement_details"
+            android:textColor="#6F43FF"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <FrameLayout
+            android:layout_width="90dp"
+            android:layout_height="100dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="7dp"
+            android:background="@mipmap/background_medal_achievement">
+
+            <ImageView
+                android:id="@+id/achievement_img2"
+                android:layout_width="65dp"
+                android:layout_height="51dp"
+                android:layout_gravity="center" />
+        </FrameLayout>
+
+        <TextView
+            android:id="@+id/dress_name2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="5dp"
+            android:text="@string/regular_bubble"
+            android:textColor="#6F43FF"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/dress_description2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="15dp"
+            android:gravity="center"
+            android:text="@string/regular_bubble"
+            android:textColor="#6F43FF"
+            android:textSize="12sp" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/achievement_img_list"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_marginStart="8dp"
+            android:background="@drawable/background_achievement_details_list"
+            android:layout_marginTop="6dp"
+            android:layout_marginEnd="8dp" />
+
+        <TextView
+            android:id="@+id/gift_details_btn2"
+            android:layout_width="100dp"
+            android:layout_height="28dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="7dp"
+            android:background="@drawable/background_skip_button"
+            android:gravity="center"
+            android:text="@string/aristocrat_determine"
+            android:textColor="#F16D00"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+</androidx.cardview.widget.CardView>

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

@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/layout"
+    android:layout_width="match_parent"
+    android:layout_height="315dp"
+    android:orientation="vertical"
+    app:cardCornerRadius="10dp"
+    app:cardElevation="0dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="18dp"
+            android:text="@string/gift_details_hint"
+            android:textColor="#5665FF"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="18dp">
+
+            <LinearLayout
+                android:layout_width="107dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="18dp"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:layout_width="107dp"
+                    android:layout_height="107dp"
+                    android:background="@mipmap/background_gift_wall_item">
+
+                    <ImageView
+                        android:id="@+id/gift_img"
+                        android:layout_width="66dp"
+                        android:layout_height="66dp"
+                        android:layout_gravity="center" />
+                </FrameLayout>
+
+                <TextView
+                    android:id="@+id/gift_details"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/gift_details_hint"
+                    android:textColor="#5665FF"
+                    android:textSize="14sp" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="8dp"
+                    android:gravity="center_vertical">
+
+                    <ImageView
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"
+                        android:src="@mipmap/diamond" />
+
+                    <TextView
+                        android:id="@+id/price"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="6dp"
+                        android:text="0"
+                        android:textColor="#5665FF"
+                        android:textSize="13sp" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1" />
+
+            <LinearLayout
+                android:layout_width="107dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="18dp"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:layout_width="107dp"
+                    android:layout_height="107dp"
+                    android:background="@mipmap/background_gift_wall_item">
+
+                    <com.makeramen.roundedimageview.RoundedImageView
+                        android:id="@+id/avatar"
+                        android:layout_width="66dp"
+                        android:layout_height="66dp"
+                        android:layout_gravity="center"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/m_chu_xia"
+                        app:riv_oval="true" />
+                </FrameLayout>
+
+                <TextView
+                    android:id="@+id/vacant_position_awaits"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/vacant_position_awaits"
+                    android:textColor="#454976"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/vacant_position"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="8dp"
+                    android:text="?"
+                    android:textColor="#454976"
+                    android:textSize="14sp" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/gift_details_btn"
+            android:layout_width="100dp"
+            android:layout_height="28dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="23dp"
+            android:background="@drawable/background_skip_button"
+            android:gravity="center"
+            android:text="@string/regular_bubble"
+            android:textColor="#F16D00"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/distance_naming"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="19dp"
+            android:text="@string/distance_naming" />
+
+    </LinearLayout>
+
+</androidx.cardview.widget.CardView>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="26dp">
+
+    <TextView
+        android:id="@+id/custom_quantity"
+        android:layout_width="match_parent"
+        android:layout_height="26dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:gravity="center"
+        android:text="@string/custom_quantity"
+        android:textColor="#FFFFFF"
+        android:textSize="14sp" />
+
+</LinearLayout>

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

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="351dp"
+    android:background="@color/transparent"
+    android:orientation="vertical"
+    tools:ignore="MissingDefaultResource">
+
+    <View
+        android:id="@+id/to_can"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <LinearLayout
+
+        android:layout_width="80dp"
+        android:layout_height="212dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginEnd="48dp"
+        android:layout_marginBottom="50dp"
+        android:background="@drawable/bg_selection_quantity"
+        android:orientation="vertical">
+
+        <TextView
+            android:clickable="true"
+            android:id="@+id/custom_quantity"
+            android:layout_width="match_parent"
+            android:layout_height="28dp"
+            android:gravity="center"
+            android:layout_marginTop="2dp"
+            android:text="@string/custom_quantity"
+            android:textColor="#FFFFFF"
+            android:textSize="14sp"
+            android:focusable="true" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/gift_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+
+
+</RelativeLayout>

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

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    tools:ignore="MissingDefaultResource">
+
+    <FrameLayout
+        android:id="@+id/no_nobility"
+        android:layout_width="67dp"
+        android:layout_height="24dp"
+        android:layout_marginTop="5dp"
+        android:background="@mipmap/icon_aristocrat_tip"
+        android:visibility="gone">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|center_vertical"
+            android:layout_marginEnd="2dp"
+            android:text="@string/live_ktgz"
+            android:textColor="#FFC008"
+            android:textSize="10sp" />
+
+    </FrameLayout>
+
+    <LinearLayout
+        android:id="@+id/established_nobility"
+        android:layout_width="78dp"
+        android:layout_height="26dp"
+        android:background="@mipmap/icon_established_nobility"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/nobility_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="1dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/vipGoldTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="贵族"
+                android:textColor="#FFC722"
+                android:textSize="10sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/vipGoldDesc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="贵族"
+                android:textColor="#CCFFFFFF"
+                android:textSize="8sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+    </LinearLayout>
+</FrameLayout>