6.5.4礼物冠名

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/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/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/GiftWallModel.java

@@ -0,0 +1,336 @@
+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;
+
+    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/dialog/GiftWallItemPopup.java

@@ -0,0 +1,25 @@
+package com.yunbao.common.dialog;
+
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.lxj.xpopup.core.CenterPopupView;
+import com.yunbao.common.R;
+
+public class GiftWallItemPopup extends CenterPopupView {
+    public GiftWallItemPopup(@NonNull Context context) {
+        super(context);
+    }
+
+    @Override
+    protected int getImplLayoutId() {
+        return R.layout.popup_gift_wall_item;
+    }
+
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+    }
+}

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

@@ -0,0 +1,85 @@
+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 android.widget.TextView;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.adapter.GiftAlreadyWallAdapter;
+import com.yunbao.common.bean.GiftAlreadyWallModel;
+import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.http.live.LiveNetManager;
+
+/**
+ * 已点亮礼物墙
+ */
+public class GiftAlreadyWallFragment extends BaseFragment {
+    private String mStream, mLiveUid;
+    private LinearLayout giftWallNoData, giftWallData;
+    private RecyclerView alreadyList;
+    private GiftAlreadyWallAdapter alreadyWallAdapter;
+    private TextView litIcon,giftAll;
+    @Override
+    public View createView(LayoutInflater layoutInflater, ViewGroup viewGroup) {
+        return layoutInflater.inflate(R.layout.fragment_gift_already_wall, viewGroup, false);
+    }
+
+
+    @Override
+    protected void initVariables(Bundle bundle) {
+        mStream = bundle.getString("mStream");
+        mLiveUid = bundle.getString("mLiveUid");
+    }
+
+    @Override
+    protected void initViews(Bundle savedInstanceState, View contentView) {
+        giftWallNoData = contentView.findViewById(R.id.gift_wall_no_data);
+        giftWallData = contentView.findViewById(R.id.gift_wall_data);
+        alreadyList = contentView.findViewById(R.id.already_list);
+        litIcon = contentView.findViewById(R.id.lit_icon);
+        giftAll = contentView.findViewById(R.id.gift_all);
+        alreadyWallAdapter = new GiftAlreadyWallAdapter();
+        alreadyList.setLayoutManager(new GridLayoutManager(getContext(), 3, GridLayoutManager.VERTICAL, false));
+        alreadyList.setAdapter(alreadyWallAdapter);
+    }
+
+    @Override
+    protected void loadData() {
+        LiveNetManager.get(getActivity()).
+                giftAlreadyWall(mLiveUid, new HttpCallback<GiftAlreadyWallModel>() {
+                    @Override
+                    public void onSuccess(GiftAlreadyWallModel data) {
+                        if (data.getGiftWall().size() > 0) {
+                            giftWallNoData.setVisibility(View.GONE);
+                            giftWallData.setVisibility(View.VISIBLE);
+                            alreadyWallAdapter.addAllData(data.getGiftWall());
+                            litIcon.setText(data.getGiftWallLightenNumber());
+                            giftAll.setText("/"+data.getGiftWallLightenTotal());
+                        } else {
+                            giftWallNoData.setVisibility(View.VISIBLE);
+                            giftWallData.setVisibility(View.GONE);
+                        }
+                    }
+
+                    @Override
+                    public void onError(String error) {
+
+                    }
+                });
+    }
+
+    public static GiftAlreadyWallFragment newInstance(String mStream, String mLiveUid) {
+        GiftAlreadyWallFragment liveGiftFragment = new GiftAlreadyWallFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("mStream", mStream);
+        bundle.putString("mLiveUid", mLiveUid);
+        liveGiftFragment.setArguments(bundle);
+        return liveGiftFragment;
+    }
+}

common/src/main/java/com/yunbao/common/fragment/GiftWithoutWallFragment.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 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;
+    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");
+    }
+
+    @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, 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) {
+        GiftWithoutWallFragment liveGiftFragment = new GiftWithoutWallFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("mStream", mStream);
+        bundle.putString("mLiveUid", mLiveUid);
+        liveGiftFragment.setArguments(bundle);
+        return liveGiftFragment;
+    }
+}

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

@@ -12,6 +12,7 @@ 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.HourRank;
 import com.yunbao.common.bean.HttpCallbackModel;
 import com.yunbao.common.bean.IMLoginModel;
@@ -830,4 +831,20 @@ public interface PDLiveApi {
             @Query("red_packet_id") String redPacketId
     );
 
+    /**
+     * 礼物墙已点亮
+     */
+    @GET("/api/public/?service=Gift.giftAlreadyWall")
+    Observable<ResponseModel<GiftAlreadyWallModel>> giftAlreadyWall(
+            @Query("liveuid") String liveUid
+    );
+
+    /**
+     * 礼物墙未点亮
+     */
+    @GET("/api/public/?service=Gift.giftWithoutWall")
+    Observable<ResponseModel<GiftAlreadyWallModel>> giftWithoutWall(
+            @Query("liveuid") String liveUid
+    );
+
 }

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

@@ -13,6 +13,7 @@ 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.HttpCallbackModel;
 import com.yunbao.common.bean.LinkMicUserBean;
 import com.yunbao.common.bean.LinkMicUserBeanV2;
@@ -1796,6 +1797,49 @@ public class LiveNetManager {
                 }).isDisposed();
     }
 
+    public void giftAlreadyWall(String liveUid, HttpCallback<GiftAlreadyWallModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .giftAlreadyWall(liveUid)
+                .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, HttpCallback<GiftAlreadyWallModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .giftWithoutWall(liveUid)
+                .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();
+    }
+
     /**
      * 直播间取消网络请求
      */

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

@@ -0,0 +1,28 @@
+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 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);
+    }
+}

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

@@ -0,0 +1,39 @@
+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.lxj.xpopup.XPopup;
+import com.yunbao.common.R;
+import com.yunbao.common.bean.GiftWallModel;
+import com.yunbao.common.dialog.GiftWallItemPopup;
+import com.yunbao.common.glide.ImgLoader;
+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() {
+                new XPopup.Builder(itemView.getContext())
+                        .asCustom(new GiftWallItemPopup(itemView.getContext()))
+                        .show();
+            }
+        });
+    }
+}

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/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/fragment_gift_already_wall.xml

@@ -0,0 +1,88 @@
+<?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: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: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/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,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_without_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/popup_gift_wall_item.xml

@@ -0,0 +1,10 @@
+<?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"
+    app:cardCornerRadius="10dp"
+    app:cardElevation="0dp"
+    android:layout_width="315dp"
+    android:layout_height="315dp"
+    android:orientation="vertical">
+
+</androidx.cardview.widget.CardView>

common/src/main/res/values-en-rUS/string.xml

@@ -1251,8 +1251,37 @@ Limited ride And limited avatar frame</string>
     <string name="red_envelope_released_successfully">Red  successfully</string>
     <string name="leveling_points">%s experience upgrade,%s receive rewards</string>
     <string name="reach_the_top">You have reached the highest level!</string>
-    <string name="nothing_in_the_package_yet">There\\\'s nothing in the package yet</string>
+    <string name="nothing_in_the_package_yet">There\'s nothing in the package yet</string>
     <string name="custom_quantity">Custom quantity</string>
+    <string name="gift_wall">Gift wall</string>
+    <string name="has_been_lit">%s has been lit</string>
+    <string name="codex">Illustrated book</string>
+    <string name="unlit_icon">unlit</string>
+    <string name="all_service_champion">All service</string>
+    <string name="unlit_icon_hint">Love \\ \"ceremony \\\" at the beginning, \\ \"wall \\\" potential light temporarily no light</string>
+    <string name="lit_icon_hint">No unlit gifts yet</string>
+    <string name="instant_light">Instant light</string>
+    <string name="honorary_achievement">Honorary achievement</string>
+    <string name="lit_icon">Lit</string>
+    <string name="gift_wall_entrance">Gift Wall Entrance</string>
+    <string name="gift_wall_entrance1">Personal profile card, personal homepage, live streaming room header button, and by clickingView personal and person\'s profile cards and homepage.</string>
+    <string name="gift_wall_entrance2">Lighting up gifts</string>
+    <string name="gift_wall_entrance3">On the gift panel and click on the gift wall of the recipient to light up the gift for gifting, Illuminate the corresponding gift icon in the recipient\'s gift wall. Only diamond gifts Can light up gifts. When the gifts in the event are compared to the gifts in the gift wall and guidebook When the same, give the same gift, first light up the event, gift wall, and picture guide A gift for.</string>
+    <string name="gift_wall_entrance4">Named gift</string>
+    <string name="gift_wall_entrance5">Within each cycle, if a certain amount of diamonds are given as a single or cumulative gift Display the most gifts given to a recipient on the gift icon Gift person avatar, clicking on the avatar can also directly reach the giver\'s homepage of the named gift.</string>
+    <string name="gift_wall_entrance6">When the gift in the guidebook is the same as the gift in the gift wall, give the same gift Objects, first point the gift on the gift wall, and then light up the gift in the guidebook. Honor achievement</string>
+    <string name="gift_wall_entrance7">Medal of Achievement</string>
+    <string name="gift_wall_entrance8_1">Medal of achievement</string>
+    <string name="gift_wall_entrance8_2">Currently, there are three achievements, namely A cloud of good friends，Very rich，</string>
+    <string name="gift_wall_entrance8_3">A cloud of good friends: When the number of gifts received reaches 20, 30, 50, 100When it comes to 200 models, light up the corresponding achievements separately;Rich and capriciou</string>
+    <string name="gift_wall_entrance8_4">A rich party: When the price of a single gift received exceeds 50000 diamonds, it is sufficient Illuminate the achievement;</string>
+    <string name="gift_wall_entrance8_5">Very rich: When receiving 100 gifts priced over 3000 diamonds, i.e This achievement can be illuminated.</string>
+    <string name="gift_wall_entrance8_6">The current user has a total of 4 achievements, namely being rich and capricious, sharing rain and dew, and giving gifts Gift machines, lighting masters.</string>
+    <string name="gift_wall_entrance8_7">Rich and capricious: Accumulated gifts worth 50K, 2M，10M, 100M, 300M, light up the corresponding achievements separately;</string>
+    <string name="gift_wall_entrance8_8">Rain and dew evenly: the cumulative Style quantity of gifts given to anchors reaches 10, 20, 50, 100，200, can achieve success;</string>
+    <string name="gift_wall_entrance8_9">gift machine: The cumulative number of gifts given reaches 200, 1000, 10K，100K，1M,light up the corresponding achievements separately;</string>
+    <string name="gift_wall_entrance8_10">lighting master: The number of unlocked Gift Walls has reached 10, 30, 50 At 100 and 200, light up the corresponding achievements separately.</string>
+    <string name="regular_bubble">rule</string>
 
 
 </resources>

common/src/main/res/values-zh-rHK/strings.xml

@@ -1248,4 +1248,33 @@
     <string name="reach_the_top">恭喜，你已達到最高等級</string>
     <string name="nothing_in_the_package_yet">包裹中暫無物品哦</string>
     <string name="custom_quantity">自定義數量</string>
+    <string name="gift_wall">禮物墻</string>
+    <string name="has_been_lit">已點亮%s個</string>
+    <string name="codex">圖鑒</string>
+    <string name="honorary_achievement">榮譽成就</string>
+    <string name="lit_icon">已點亮</string>
+    <string name="unlit_icon">未點亮</string>
+    <string name="all_service_champion">全服冠軍</string>
+    <string name="unlit_icon_hint">愛\\“禮\\”伊始，\\“墻\\”勢點亮  暫無點亮</string>
+    <string name="lit_icon_hint">暂无未点亮礼物哦</string>
+    <string name="instant_light">立即點亮</string>
+    <string name="gift_wall_entrance">禮物墻入口</string>
+    <string name="gift_wall_entrance1">個人資料卡片、個人主頁、直播間頭部按鈕及通過點擊 自己與TA人的資料卡和主頁查看。</string>
+    <string name="gift_wall_entrance2">點亮禮物</string>
+    <string name="gift_wall_entrance3">在禮物面板和點擊收禮人禮物牆待點亮的禮物進行送禮， 即點亮收禮人禮物牆中對應的禮物圖標。只有鑽石送禮可點亮禮物。當活動中的禮物與禮物牆和圖鑒中的禮物相同時，則的禮物。</string>
+    <string name="gift_wall_entrance4">冠名禮物</string>
+    <string name="gift_wall_entrance5">每個週期內單個或累計送同一禮物達一定數量鑽石，會在該禮物圖標上顯示對於某位收禮人而言送出最多的送禮人頭像，點擊頭像還可直達冠名禮物的送禮人主頁。</string>
+    <string name="gift_wall_entrance6">當圖鑒的禮物與禮物牆中的禮物相同時，則送同一個禮物，先點禮物牆的禮物，之後再點亮圖鑒的禮物。</string>
+    <string name="gift_wall_entrance7">榮譽成就</string>
+    <string name="gift_wall_entrance8_1">成就勳章</string>
+    <string name="gift_wall_entrance8_2">當前主播共有3個成就，分別是勝友如雲、富甲一方、腰纏萬貫。</string>
+    <string name="gift_wall_entrance8_3">勝友如雲：當收到的禮物款數達到20、30、50、100、200款時，分別點亮對應的成就；</string>
+    <string name="gift_wall_entrance8_4">富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就；</string>
+    <string name="gift_wall_entrance8_5">腰纏萬貫：當收到100款價格超過3000鑽的禮物時，即可點亮該成就。</string>
+    <string name="gift_wall_entrance8_6">當前用戶共有4個成就，分別是有錢任性、雨露均沾、送禮機器、點燈大師。</string>
+    <string name="gift_wall_entrance8_7">有錢任性：纍計送出禮物價值鉆石數量達到50K、2M、10M、100M、300M時，分別點亮對應的成就</string>
+    <string name="gift_wall_entrance8_8">雨露均沾：纍計送禮給主播人數達到10、20、50、100、200時，分別點亮對應的成就；</string>
+    <string name="gift_wall_entrance8_9">送禮機器：纍計贈送禮物個數達到200、1000、10K、00K、1M時，分別點亮對應的成就；</string>
+    <string name="gift_wall_entrance8_10">點燈大師：解鎖【禮物墻】的數量達到10、30、50、100、200時,分別點亮對應的成就</string>
+    <string name="regular_bubble">規則</string>
 </resources>

common/src/main/res/values-zh-rTW/strings.xml

@@ -1247,4 +1247,33 @@
     <string name="reach_the_top">恭喜，你已達到最高等級</string>
     <string name="nothing_in_the_package_yet">包裹中暫無物品哦</string>
     <string name="custom_quantity">自定義數量</string>
+    <string name="gift_wall">禮物墻</string>
+    <string name="has_been_lit">已點亮%s個</string>
+    <string name="codex">圖鑒</string>
+    <string name="honorary_achievement">榮譽成就</string>
+    <string name="lit_icon">已點亮</string>
+    <string name="unlit_icon">未點亮</string>
+    <string name="all_service_champion">全服冠軍</string>
+    <string name="unlit_icon_hint">愛\\“禮\\”伊始，\\“墻\\”勢點亮  暫無點亮</string>
+    <string name="lit_icon_hint">暂无未点亮礼物哦</string>
+    <string name="instant_light">立即點亮</string>
+    <string name="gift_wall_entrance">禮物墻入口</string>
+    <string name="gift_wall_entrance1">個人資料卡片、個人主頁、直播間頭部按鈕及通過點擊 自己與TA人的資料卡和主頁查看。</string>
+    <string name="gift_wall_entrance2">點亮禮物</string>
+    <string name="gift_wall_entrance3">在禮物面板和點擊收禮人禮物牆待點亮的禮物進行送禮， 即點亮收禮人禮物牆中對應的禮物圖標。只有鑽石送禮可點亮禮物。當活動中的禮物與禮物牆和圖鑒中的禮物相同時，則的禮物。</string>
+    <string name="gift_wall_entrance4">冠名禮物</string>
+    <string name="gift_wall_entrance5">每個週期內單個或累計送同一禮物達一定數量鑽石，會在該禮物圖標上顯示對於某位收禮人而言送出最多的送禮人頭像，點擊頭像還可直達冠名禮物的送禮人主頁。</string>
+    <string name="gift_wall_entrance6">當圖鑒的禮物與禮物牆中的禮物相同時，則送同一個禮物，先點禮物牆的禮物，之後再點亮圖鑒的禮物。</string>
+    <string name="gift_wall_entrance7">榮譽成就</string>
+    <string name="gift_wall_entrance8_1">成就勳章</string>
+    <string name="gift_wall_entrance8_2">當前主播共有3個成就，分別是勝友如雲、富甲一方、腰纏萬貫。</string>
+    <string name="gift_wall_entrance8_3">勝友如雲：當收到的禮物款數達到20、30、50、100、200款時，分別點亮對應的成就；</string>
+    <string name="gift_wall_entrance8_4">富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就；</string>
+    <string name="gift_wall_entrance8_5">腰纏萬貫：當收到100款價格超過3000鑽的禮物時，即可點亮該成就。</string>
+    <string name="gift_wall_entrance8_6">當前用戶共有4個成就，分別是有錢任性、雨露均沾、送禮機器、點燈大師。</string>
+    <string name="gift_wall_entrance8_7">有錢任性：纍計送出禮物價值鉆石數量達到50K、2M、10M、100M、300M時，分別點亮對應的成就</string>
+    <string name="gift_wall_entrance8_8">雨露均沾：纍計送禮給主播人數達到10、20、50、100、200時，分別點亮對應的成就；</string>
+    <string name="gift_wall_entrance8_9">送禮機器：纍計贈送禮物個數達到200、1000、10K、00K、1M時，分別點亮對應的成就；</string>
+    <string name="gift_wall_entrance8_10">點燈大師：解鎖【禮物墻】的數量達到10、30、50、100、200時,分別點亮對應的成就</string>
+    <string name="regular_bubble">規則</string>
 </resources>

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

@@ -1248,6 +1248,35 @@
     <string name="reach_the_top">恭喜，你已達到最高等級</string>
     <string name="nothing_in_the_package_yet">包裹中暫無物品哦</string>
     <string name="custom_quantity">自定義數量</string>
+    <string name="gift_wall">禮物墻</string>
+    <string name="has_been_lit">已點亮%s個</string>
+    <string name="codex">圖鑒</string>
+    <string name="unlit_icon">未點亮</string>
+    <string name="all_service_champion">全服冠軍</string>
+    <string name="unlit_icon_hint">愛\\“禮\\”伊始，\\“墻\\”勢點亮  暫無點亮</string>
+    <string name="lit_icon_hint">暂无未点亮礼物哦</string>
+    <string name="instant_light">立即點亮</string>
+    <string name="honorary_achievement">榮譽成就</string>
+    <string name="lit_icon">已點亮</string>
+    <string name="gift_wall_entrance">禮物墻入口</string>
+    <string name="gift_wall_entrance1">個人資料卡片、個人主頁、直播間頭部按鈕及通過點擊 自己與TA人的資料卡和主頁查看。</string>
+    <string name="gift_wall_entrance2">點亮禮物</string>
+    <string name="gift_wall_entrance3">在禮物面板和點擊收禮人禮物牆待點亮的禮物進行送禮， 即點亮收禮人禮物牆中對應的禮物圖標。只有鑽石送禮可點亮禮物。當活動中的禮物與禮物牆和圖鑒中的禮物相同時，則的禮物。</string>
+    <string name="gift_wall_entrance4">冠名禮物</string>
+    <string name="gift_wall_entrance5">每個週期內單個或累計送同一禮物達一定數量鑽石，會在該禮物圖標上顯示對於某位收禮人而言送出最多的送禮人頭像，點擊頭像還可直達冠名禮物的送禮人主頁。</string>
+    <string name="gift_wall_entrance6">當圖鑒的禮物與禮物牆中的禮物相同時，則送同一個禮物，先點禮物牆的禮物，之後再點亮圖鑒的禮物。</string>
+    <string name="gift_wall_entrance7">榮譽成就</string>
+    <string name="gift_wall_entrance8_1">成就勳章</string>
+    <string name="gift_wall_entrance8_2">當前主播共有3個成就，分別是勝友如雲、富甲一方、腰纏萬貫。</string>
+    <string name="gift_wall_entrance8_3">勝友如雲：當收到的禮物款數達到20、30、50、100、200款時，分別點亮對應的成就；</string>
+    <string name="gift_wall_entrance8_4">富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就；</string>
+    <string name="gift_wall_entrance8_5">腰纏萬貫：當收到100款價格超過3000鑽的禮物時，即可點亮該成就。</string>
+    <string name="gift_wall_entrance8_6">當前用戶共有4個成就，分別是有錢任性、雨露均沾、送禮機器、點燈大師。</string>
+    <string name="gift_wall_entrance8_7">有錢任性：纍計送出禮物價值鉆石數量達到50K、2M、10M、100M、300M時，分別點亮對應的成就</string>
+    <string name="gift_wall_entrance8_8">雨露均沾：纍計送禮給主播人數達到10、20、50、100、200時，分別點亮對應的成就；</string>
+    <string name="gift_wall_entrance8_9">送禮機器：纍計贈送禮物個數達到200、1000、10K、00K、1M時，分別點亮對應的成就；</string>
+    <string name="gift_wall_entrance8_10">點燈大師：解鎖【禮物墻】的數量達到10、30、50、100、200時,分別點亮對應的成就</string>
+    <string name="regular_bubble">規則</string>
 
 
 </resources>

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

@@ -1251,7 +1251,37 @@ Limited ride And limited avatar frame</string>
     <string name="lucky_red_envelope_amount">number</string>
     <string name="red_envelope_released_successfully">>Red  successfully</string>
     <string name="leveling_points">%s experience upgrade,%s receive rewards</string>
-    <string name="nothing_in_the_package_yet">There\\\'s nothing in the package yet</string>
+    <string name="nothing_in_the_package_yet">There\'s nothing in the package yet</string>
     <string name="reach_the_top">You have reached the highest level!</string>
     <string name="custom_quantity">Custom quantity</string>
+    <string name="gift_wall">Gift wall</string>
+    <string name="has_been_lit">%s has been lit</string>
+    <string name="unlit_icon">unlit</string>
+    <string name="all_service_champion">All service</string>
+    <string name="unlit_icon_hint">Love \\ \"ceremony \\\" at the beginning, \\ \"wall \\\" potential light temporarily no light</string>
+    <string name="lit_icon_hint">No unlit gifts yet</string>
+    <string name="instant_light">Instant light</string>
+    <string name="gift_wall_entrance">Gift Wall Entrance</string>
+    <string name="gift_wall_entrance1">Personal profile card, personal homepage, live streaming room header button, and by clicking</string>
+    <string name="gift_wall_entrance2">Lighting up gifts</string>
+    <string name="gift_wall_entrance3">On the gift panel and click on the gift wall of the recipient to light up the gift for gifting, Illuminate the corresponding gift icon in the recipient\'s gift wall. Only diamond gifts Can light up gifts. When the gifts in the event are compared to the gifts in the gift wall and guidebook When the same, give the same gift, first light up the event, gift wall, and picture guide A gift for.</string>
+    <string name="gift_wall_entrance4">Named gift</string>
+    <string name="gift_wall_entrance5">Within each cycle, if a certain amount of diamonds are given as a single or cumulative gift Display the most gifts given to a recipient on the gift icon Gift person avatar, clicking on the avatar can also directly reach the giver\'s homepage of the named gift.</string>
+    <string name="gift_wall_entrance6">When the gift in the guidebook is the same as the gift in the gift wall, give the same gift Objects, first point the gift on the gift wall, and then light up the gift in the guidebook. Honor achievement</string>
+    <string name="gift_wall_entrance7">Medal of Achievement</string>
+    <string name="gift_wall_entrance8_1">Medal of achievement</string>
+    <string name="gift_wall_entrance8_2">Currently, there are three achievements, namely A cloud of good friends，Very rich，</string>
+    <string name="gift_wall_entrance8_3">A cloud of good friends: When the number of gifts received reaches 20, 30, 50, 100When it comes to 200 models, light up the corresponding achievements separately;Rich and capriciou</string>
+    <string name="gift_wall_entrance8_4">A rich party: When the price of a single gift received exceeds 50000 diamonds, it is sufficient Illuminate the achievement;</string>
+    <string name="gift_wall_entrance8_5">Very rich: When receiving 100 gifts priced over 3000 diamonds, i.e This achievement can be illuminated.</string>
+    <string name="gift_wall_entrance8_6">The current user has a total of 4 achievements, namely being rich and capricious, sharing rain and dew, and giving gifts Gift machines, lighting masters.</string>
+    <string name="gift_wall_entrance8_7">Rich and capricious: Accumulated gifts worth 50K, 2M，10M, 100M, 300M, light up the corresponding achievements separately;</string>
+    <string name="gift_wall_entrance8_8">Rain and dew evenly: the cumulative Style quantity of gifts given to anchors reaches 10, 20, 50, 100，200, can achieve success;</string>
+    <string name="gift_wall_entrance8_9">gift machine: The cumulative number of gifts given reaches 200, 1000, 10K，100K，1M,light up the corresponding achievements separately;</string>
+    <string name="gift_wall_entrance8_10">lighting master: The number of unlocked Gift Walls has reached 10, 30, 50 At 100 and 200, light up the corresponding achievements separately.</string>
+    <string name="regular_bubble">rule</string>
+    <string name="codex">Illustrated book</string>
+    <string name="honorary_achievement">Honorary achievement</string>
+    <string name="lit_icon">Lit</string>
+
 </resources>

gradle.properties

@@ -19,8 +19,8 @@ org.gradle.configureondemand=true
 android.useAndroidX=true
 android.enableJetifier=true
 
-#systemProp.http.proxyHost=127.0.0.1
+systemProp.http.proxyHost=127.0.0.1
-#systemProp.https.proxyHost=127.0.0.1
+systemProp.https.proxyHost=127.0.0.1
-#systemProp.https.proxyPort=7890
+systemProp.https.proxyPort=10809
-#systemProp.http.proxyPort=7890
+systemProp.http.proxyPort=10809
 #android.enableR8.fullMode=true

live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java

@@ -90,7 +90,6 @@ import com.yunbao.live.bean.ImUserBean;
 import com.yunbao.live.bean.LiveChatBean;
 import com.yunbao.live.dialog.LiveFansFragment;
 import com.yunbao.live.dialog.LiveGameDialogFragment;
-import com.yunbao.live.dialog.LiveGiftDialogFragment;
 import com.yunbao.live.dialog.LiveGiftPopup;
 import com.yunbao.live.dialog.LiveHDDialogFragment;
 import com.yunbao.live.dialog.LiveInputDialogFragment;
@@ -1433,6 +1432,17 @@ public class LiveAudienceActivity extends LiveActivity {
                 liveInputDialogFragment.setArguments(liveInputBundle);
                 liveInputDialogFragment.show(getSupportFragmentManager(), "LiveInputDialogFragment");
                 break;
+            case IS_ATTENTION:
+                if (manager != null) {
+                    manager.setAttention(event.getLiveType());
+                }
+
+                break;
+            case GIFT_WALL:
+                if (manager != null) {
+                    manager.showGiftWall();
+                }
+                break;
 
         }
 

live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java

@@ -0,0 +1,202 @@
+package com.yunbao.live.dialog;
+
+import android.content.DialogInterface;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.fragment.app.FragmentTransaction;
+
+import com.lxj.xpopup.XPopup;
+import com.makeramen.roundedimageview.RoundedImageView;
+import com.yunbao.common.Constants;
+import com.yunbao.common.dialog.AbsDialogFragment;
+import com.yunbao.common.fragment.GiftAlreadyWallFragment;
+import com.yunbao.common.fragment.GiftWithoutWallFragment;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.http.CommonHttpUtil;
+import com.yunbao.common.interfaces.CommonCallback;
+import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+import com.yunbao.live.R;
+import com.yunbao.live.activity.LiveActivity;
+import com.yunbao.live.event.GiftTitleEvent;
+import com.yunbao.live.event.LiveAudienceEvent;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 礼物墙
+ */
+public class GiftWallDialog extends AbsDialogFragment {
+    private LinearLayout layoutLitIcon, layoutUnlitIcon, layoutAllServiceChampion;
+    private TextView textLitIcon, textUnlitIcon, textAllServiceChampion, anchorName, regularBubble;
+    private View viewAllServiceChampion, viewUnlitIcon, viewLitIcon, attention;
+    private RoundedImageView avatar;
+    private List<TextView> tabText = new ArrayList<>();
+    private List<View> tabView = new ArrayList<>();
+    private String mStream, mAnchorName, mLiveUid, mAvatarUrl;
+    private int isAttention = 0;//是否关注 0=没关注,
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        Bus.getOn(this);
+        initView();
+        initDate();
+    }
+
+    private void initView() {
+        layoutLitIcon = mRootView.findViewById(R.id.layout_lit_icon);
+        layoutUnlitIcon = mRootView.findViewById(R.id.layout_unlit_icon);
+        layoutAllServiceChampion = mRootView.findViewById(R.id.layout_all_service_champion);
+        textLitIcon = mRootView.findViewById(R.id.text_lit_icon);
+        textUnlitIcon = mRootView.findViewById(R.id.text_unlit_icon);
+        textAllServiceChampion = mRootView.findViewById(R.id.text_all_service_champion);
+        viewAllServiceChampion = mRootView.findViewById(R.id.view_all_service_champion);
+        viewUnlitIcon = mRootView.findViewById(R.id.view_unlit_icon);
+        viewLitIcon = mRootView.findViewById(R.id.view_lit_icon);
+        avatar = mRootView.findViewById(R.id.avatar);
+        attention = mRootView.findViewById(R.id.attention);
+        anchorName = mRootView.findViewById(R.id.anchor_name);
+        regularBubble = mRootView.findViewById(R.id.regular_bubble);
+        tabText.add(textLitIcon);
+        tabText.add(textUnlitIcon);
+        tabText.add(textAllServiceChampion);
+        tabView.add(viewLitIcon);
+        tabView.add(viewUnlitIcon);
+        tabView.add(viewAllServiceChampion);
+        selectTab(textLitIcon, viewLitIcon);
+        ViewClicksAntiShake.clicksAntiShake(layoutLitIcon, () -> {
+            selectTab(textLitIcon, viewLitIcon);
+            FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+            transaction.replace(R.id.context_layout_gift, GiftAlreadyWallFragment.newInstance(mStream, mLiveUid));
+            transaction.commit();
+        });
+        ViewClicksAntiShake.clicksAntiShake(layoutUnlitIcon, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                selectTab(textUnlitIcon, viewUnlitIcon);
+                FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+                transaction.replace(R.id.context_layout_gift, GiftWithoutWallFragment.newInstance(mStream, mLiveUid));
+                transaction.commit();
+
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(layoutAllServiceChampion, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                selectTab(textAllServiceChampion, viewAllServiceChampion);
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(attention, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                CommonHttpUtil.setAttention(mLiveUid, new CommonCallback<Integer>() {
+                    @Override
+                    public void callback(Integer isAttention) {
+                        if (isAttention == 1) {
+                            LiveActivity.sendSystemMessage(IMLoginManager.get(getContext()).getUserInfo().getUserNicename()
+                                    + getActivity().getString(R.string.live_follow_anchor));
+                            attention.setVisibility(View.GONE);
+                            Bus.get().post(new LiveAudienceEvent()
+                                    .setType(LiveAudienceEvent.LiveAudienceType.IS_ATTENTION).setLiveType(isAttention));
+                        }
+                    }
+                });
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(regularBubble, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                new XPopup.Builder(getContext())
+                        .asCustom(new RegularIntroducePopup(getContext()))
+                        .show();
+            }
+        });
+    }
+
+    private void initDate() {
+        Bundle bundle = getArguments();
+        if (bundle == null) {
+            return;
+        }
+        mLiveUid = bundle.getString(Constants.LIVE_UID);
+        mStream = bundle.getString(Constants.STREAM);
+        mAnchorName = bundle.getString("mAnchorName");
+        mAvatarUrl = bundle.getString("mAvatarUrl");
+        isAttention = bundle.getInt("isAttention");
+
+        FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+        transaction.replace(R.id.context_layout_gift, GiftAlreadyWallFragment.newInstance(mStream, mLiveUid));
+        transaction.commit();
+        ImgLoader.display(getContext(), mAvatarUrl, avatar);
+        anchorName.setText(mAnchorName);
+        attention.setVisibility(isAttention == 0 ? View.VISIBLE : View.GONE);
+    }
+
+    private void selectTab(TextView textView, View tab) {
+        for (TextView view : tabText) {
+            if (textView == view) {
+                view.setTypeface(Typeface.SANS_SERIF, Typeface.BOLD_ITALIC);
+            } else {
+                view.setTypeface(Typeface.SANS_SERIF, Typeface.ITALIC);
+            }
+        }
+        for (View view : tabView) {
+            view.setVisibility(view == tab ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        super.onDismiss(dialog);
+        Bus.getOff(this);
+
+    }
+
+    // 返回自定义弹窗的布局
+    @Override
+    protected int getLayoutId() {
+        return R.layout.dialog_live_gift_wall;
+    }
+
+    @Override
+    protected int getDialogStyle() {
+        return R.style.dialog2;
+    }
+
+    @Override
+    protected boolean canCancel() {
+        return true;
+    }
+
+    @Override
+    protected void setWindowAttributes(Window window) {
+        window.setWindowAnimations(com.yunbao.common.R.style.bottomToTopAnim);
+        window.setDimAmount(0f);//去掉遮罩层（全透明）
+        WindowManager.LayoutParams params = window.getAttributes();
+        params.width = WindowManager.LayoutParams.MATCH_PARENT;
+        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        params.gravity = Gravity.BOTTOM;
+        window.setAttributes(params);
+    }
+
+    /**
+     * 关于点击礼物分类的通知
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onGiftTitleEvent(GiftTitleEvent event) {
+
+    }
+}

live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java

@@ -57,6 +57,7 @@ import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.DeviceUtils;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.NobleUtil;
 import com.yunbao.common.utils.SVGAViewUtils;
@@ -175,7 +176,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
         //设置礼物弹窗背景
         ImgLoader.displayBlurLive(getContext(), R.drawable.backgroud_custom_gift2, gitBackground);
         gitBackground.setAlpha(0.97f);
-        ImgLoader.display(getContext(), R.mipmap.icon_arrow_right, iconArrow);
+        ImgLoader.display(getContext(), R.mipmap.icon_arrow_right_2, iconArrow);
         //礼物分类tab
         LinearLayoutManager manager = new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false);
         giftTitle.setLayoutManager(manager);
@@ -239,7 +240,9 @@ public class LiveGiftPopup extends AbsDialogFragment {
                         .append("/h5/info/index.html?uid=")
                         .append(userInfo.getId())
                         .append("&token=")
-                        .append(userInfo.getToken());
+                        .append(userInfo.getToken())
+                        .append("&no_back=1")
+                ;
                 Bundle bundle = new Bundle();
                 bundle.putString("url", htmlUrl.toString());
                 LiveHDDialogFragment fragment = new LiveHDDialogFragment();
@@ -269,6 +272,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
                         .append("&for");
                 Bundle bundle = new Bundle();
                 bundle.putString("url", htmlUrl.toString());
+                bundle.putInt("height", DeviceUtils.getScreenHeight(getActivity()) / 5 * 3);
                 LiveHDDialogFragment fragment = new LiveHDDialogFragment();
                 fragment.setArguments(bundle);
                 fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
@@ -301,6 +305,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
                         .append("&for");
                 Bundle bundle = new Bundle();
                 bundle.putString("url", htmlUrl.toString());
+
                 LiveHDDialogFragment fragment = new LiveHDDialogFragment();
                 fragment.setArguments(bundle);
                 fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");

live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java

@@ -109,7 +109,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
     private TextView mUnion;
     private TextView mHonorVal;
     private TextView mNobleTitleVal;
-    private TextView mLvVal;
+    private TextView mLvVal, textGiftWall, valueGiftWall;
     private ImageView mFollowImage;
     private ImageView mSex;
     private ImageView good_nub_ico;
@@ -121,13 +121,13 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
     private ImageView shawl;
     private ImageView honorIcon;
     private ImageView mTitleBg;
-    private ImageView mSetting;
+    private ImageView mSetting, iconGiftWall;
     private UserBean mUserBean;
     private LinearLayout mGuardLayout;
     private LinearLayout mUnionLayout;
     private LinearLayout mNobleIconLayout;
     private LinearLayout mUserLevelLayout;
-    private LinearLayout mHonorLayout;
+    private LinearLayout mHonorLayout, giftWall;
     private boolean mFollowing;
     GifImageView btn_live;
     SVGAImageView gift_svga;
@@ -239,6 +239,10 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
         mNobleIconLayout = mRootView.findViewById(R.id.noble_icon_layout);
         mNobleTitleVal = mRootView.findViewById(R.id.noble_title_val);
         mHonorLayout = mRootView.findViewById(R.id.honor_layout);
+        giftWall = mRootView.findViewById(R.id.gift_wall);
+        textGiftWall = mRootView.findViewById(R.id.text_gift_wall);
+        valueGiftWall = mRootView.findViewById(R.id.value_gift_wall);
+        iconGiftWall = mRootView.findViewById(R.id.icon_gift_wall);
         mTitleBg = mRootView.findViewById(R.id.title_bg);
         mSetting = mRootView.findViewById(R.id.btn_setting);
         mLvVal = mRootView.findViewById(R.id.user_card_lv_val);
@@ -264,6 +268,14 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
                 }
             }
         });*/
+        ViewClicksAntiShake.clicksAntiShake(giftWall, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                Bus.get().post(new LiveAudienceEvent()
+                        .setType(LiveAudienceEvent.LiveAudienceType.GIFT_WALL));
+                dismiss();
+            }
+        });
 
 
     }
@@ -344,19 +356,6 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
             case SETTING_ACTION_ANC_ADM:
                 mSetting.setVisibility(View.VISIBLE);
         }
-        if (isAnchor) {
-            mGuardLayout.setVisibility(View.VISIBLE);
-            if (obj.containsKey("user_president_name") && !StringUtil.isEmpty(obj.getString("user_president_name"))) {
-                mUnion.setText(obj.getString("user_president_name"));
-                mUnionLayout.setVisibility(View.VISIBLE);
-            }
-            mNoble.setVisibility(View.GONE);
-            mUserLevelLayout.setBackgroundResource(R.drawable.bg_user_card_lv);
-            mNobleTitleVal.setText(R.string.live_noble_fens_anchor);
-            mNobleIconLayout.setBackgroundResource(R.drawable.bg_user_card_fans);
-        } else {
-            mUserLevelLayout.setBackgroundResource(R.drawable.bg_user_card_au_lv);
-        }
         mName.setText(obj.getString("user_nicename"));
         if (mUserBean.getGoodnum() != null && !mUserBean.getGoodnum().equals("")) {
             if (!isAnchor) {
@@ -370,7 +369,34 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
             good_nub_ico.setVisibility(View.GONE);
             mID.setText(mUserBean.getId());
         }
+        giftWall.setBackgroundResource(R.drawable.bg_gift_wall_lv);
+        ImgLoader.display(mContext, R.drawable.icon_gift_wall, iconGiftWall);
+        textGiftWall.setText(mContext.getString(R.string.gift_wall));
+        valueGiftWall.setText(String.format(mContext.getString(R.string.has_been_lit), obj.getString("gift_wall_lighten_number")));
         mSex.setImageResource(CommonIconUtil.getSexIconForUserCard(obj.getIntValue("sex")));
+        if (isAnchor) {
+            mGuardLayout.setVisibility(View.VISIBLE);
+            if (obj.containsKey("user_president_name") && !StringUtil.isEmpty(obj.getString("user_president_name"))) {
+                mUnion.setText(obj.getString("user_president_name"));
+                mUnionLayout.setVisibility(View.VISIBLE);
+            }
+            mNoble.setVisibility(View.GONE);
+            mUserLevelLayout.setBackgroundResource(R.drawable.bg_user_card_lv);
+
+            mHonorLayout.setBackgroundResource(R.drawable.bg_user_card_honor);
+            mNobleTitleVal.setText(R.string.live_noble_fens_anchor);
+            mNobleIconLayout.setBackgroundResource(R.drawable.bg_user_card_fans);
+        } else {
+            mUserLevelLayout.setBackgroundResource(R.drawable.bg_user_card_au_lv);
+//            giftWall.setBackgroundResource(R.drawable.bg_gift_wall_lv);
+//            mNobleIconLayout.setBackgroundResource(R.drawable.bg_user_card_fans);
+//            mHonorLayout.setBackgroundResource(R.drawable.bg_user_card_honor);
+//
+//            ImgLoader.display(mContext, R.drawable.icon_gift_wall, mNobleIcon);
+//            ImgLoader.display(mContext, R.drawable.icon_gift_wall, mNobleIcon);
+//            textGiftWall.setText(mContext.getString(R.string.gift_wall));
+//            valueGiftWall.setText(String.format(mContext.getString(R.string.has_been_lit), obj.getString("gift_wall_lighten_number")));
+        }
         LevelBean levelBean;
         if (isAnchor) {
             levelBean = CommonAppConfig.getInstance().getAnchorLevel(mUserBean.getLevelAnchor());

live/src/main/java/com/yunbao/live/dialog/RegularIntroducePopup.java

@@ -0,0 +1,36 @@
+package com.yunbao.live.dialog;
+
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.lxj.xpopup.impl.FullScreenPopupView;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+import com.yunbao.live.R;
+
+/**
+ * 礼物冠名规则
+ */
+public class RegularIntroducePopup extends FullScreenPopupView {
+    public RegularIntroducePopup(@NonNull Context context) {
+        super(context);
+    }
+
+    @Override
+    protected int getImplLayoutId() {
+        return R.layout.rogular_introduce_popup;
+    }
+
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        //初始化
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.close_btn), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                dialog.dismiss();
+            }
+        });
+    }
+}

live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java

@@ -462,7 +462,9 @@ public class LiveAudienceEvent extends BaseModel {
         BLIND_BOX(68, "盲盒全服通知"),
         RED_PACKET(69, "RedPacket"),
         RED_PACKET_SUPER_JACKPOT(70, "超级红包"),
-        INPUT_DIALOG(71, "输入框");
+        INPUT_DIALOG(71, "输入框"),
+        IS_ATTENTION(72,"是否关注主播"),
+        GIFT_WALL(73,"礼物墙");
 
         private int type;
         private String name;

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

@@ -147,11 +147,11 @@ import com.yunbao.live.bean.WishlistItemModel;
 import com.yunbao.live.custom.LiveLightView;
 import com.yunbao.live.custom.RightGradual;
 import com.yunbao.live.custom.TopGradual;
+import com.yunbao.live.dialog.GiftWallDialog;
 import com.yunbao.live.dialog.LiveFaceUnityDialogFragment;
 import com.yunbao.live.dialog.LiveFansMedalDialogFragment;
 import com.yunbao.live.dialog.LiveGameDialogFragment;
 import com.yunbao.live.dialog.LiveHDDialogFragment;
-import com.yunbao.live.dialog.LiveUserAnchorMailBoxWebInfoPopDialog;
 import com.yunbao.live.dialog.LiveUserDialogFragment;
 import com.yunbao.live.dialog.LiveWishListDialogFragment4Audience;
 import com.yunbao.live.dialog.ReceiveRendPacketPopup;
@@ -350,7 +350,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
 
     //接口整合新加参数
     private GuardUserModel guardUserModel;
-    private static ViewFlipper flipper;
+    private static ViewFlipper flipper, wksAndGiftWall;
     private TextView mRandomPkTimer;
 
     //全服通知
@@ -948,6 +948,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         mic_view1 = (RelativeLayout) findViewById(R.id.mic_view1);
         mic_view2 = (RelativeLayout) findViewById(R.id.mic_view2);
         flipper = (ViewFlipper) findViewById(R.id.hour_rank_list);
+        wksAndGiftWall = (ViewFlipper) findViewById(R.id.live_wks_and_gift_wall);
         mic_ico = (ImageView) findViewById(R.id.mic_ico);
         newMessage = (ImageView) findViewById(R.id.new_message);
         atMessage = (ImageView) findViewById(R.id.at_message);
@@ -1371,7 +1372,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         reloadIM();
 //        initStarChallengeStatus();
 
-        new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveWksLayout, "rectangle_new.png", 1);
+
         new LoadDian9TuUtil().loadDian9TuAssets2(mContext, wishListLayout2, "rectangle_new.png", 1);
 
     }
@@ -2428,13 +2429,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 }
             }
         });
-        //点击打开周星榜
+//        //点击打开周星榜
-        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.live_wks_layout),
+//        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.live_wks_layout),
-                () -> {
+//                () -> {
-
+//
-                    Bus.get().post(new LiveAudienceEvent()
+//                    Bus.get().post(new LiveAudienceEvent()
-                            .setType(LiveAudienceEvent.LiveAudienceType.LIVE_WKS));
+//                            .setType(LiveAudienceEvent.LiveAudienceType.LIVE_WKS));
-                });
+//                });
     }
 
     public static int pkEndIndex = 0;
@@ -2657,6 +2658,18 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         }
     }
 
+    public void showGiftWall() {
+        GiftWallDialog giftWallDialog = new GiftWallDialog();
+        Bundle bundle = new Bundle();
+        bundle.putString(Constants.LIVE_UID, mLiveUid);
+        bundle.putString(Constants.LIVE_STREAM, mStream);
+        bundle.putString("mAnchorName", mAnchorName);
+        bundle.putString("mAvatarUrl", mAvatarUrl);
+        bundle.putInt("isAttention", isAttention);
+        giftWallDialog.setArguments(bundle);
+        giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog");
+    }
+
     public boolean pkHandler = true;
 
     //左上角显示对方主播头像及昵称
@@ -2811,6 +2824,56 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         }
     }
 
+    /**
+     * 设置礼物墙和周星榜
+     */
+    public void setGiftWall(String giftWallLightenNumber, String giftWallLightenTotal) {
+        if (wksAndGiftWall.getChildCount() > 0) {
+            wksAndGiftWall.removeAllViews();
+        }
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DpUtil.dp2px(16), DpUtil.dp2px(16));
+        LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        textParams.leftMargin = DpUtil.dp2px(5);
+        textParams.rightMargin = DpUtil.dp2px(5);
+        params.leftMargin = DpUtil.dp2px(5);
+        View weekView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
+        ImageView weekViewPic = weekView.findViewById(R.id.wish_pic);
+        TextView week = weekView.findViewById(R.id.wish_index);
+        week.setLayoutParams(textParams);
+        week.setGravity(Gravity.CENTER);
+        week.setText(mContext.getString(R.string.live_wks));
+        weekViewPic.setImageResource(R.mipmap.live_icon_zhouxing);
+        weekViewPic.setLayoutParams(params);
+        if (!TextUtils.isEmpty(giftWallLightenNumber) && !TextUtils.isEmpty(giftWallLightenTotal)) {
+            StringBuffer stringBuffer = new StringBuffer();
+            stringBuffer.append(mContext.getString(R.string.gift_wall))
+                    .append(giftWallLightenNumber)
+                    .append("/")
+                    .append(giftWallLightenTotal);
+            View giftWall = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
+            ImageView giftWallPic = giftWall.findViewById(R.id.wish_pic);
+            TextView giftText = giftWall.findViewById(R.id.wish_index);
+            giftText.setText(stringBuffer.toString());
+            giftText.setGravity(Gravity.CENTER);
+            giftText.setLayoutParams(textParams);
+            giftWallPic.setImageResource(R.mipmap.icon_gift_wall);
+            giftWallPic.setLayoutParams(params);
+            wksAndGiftWall.addView(giftWall);
+            ViewClicksAntiShake.clicksAntiShake(giftWall, new ViewClicksAntiShake.ViewClicksCallBack() {
+                @Override
+                public void onViewClicks() {
+                    Bus.get().post(new LiveAudienceEvent()
+                            .setType(LiveAudienceEvent.LiveAudienceType.GIFT_WALL));
+                }
+            });
+        }
+
+        ViewClicksAntiShake.clicksAntiShake(weekView, () -> Bus.get().post(new LiveAudienceEvent()
+                .setType(LiveAudienceEvent.LiveAudienceType.LIVE_WKS)));
+        wksAndGiftWall.addView(weekView);
+        wksAndGiftWall.startFlipping();
+        new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveWksLayout, "rectangle_new.png", 1);
+    }
 
     /**
      * 守护信息发生变化
@@ -5073,7 +5136,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                                                         .setType(LiveAudienceEvent.LiveAudienceType.GIFT_POPUP)
                                                         .setmLiveUid(mLiveUid)
                                                         .setmStream(mStream)
-                                                                .setmWishGiftId(data.getGiftId() + "")
+                                                        .setmWishGiftId(data.getGiftId() + "")
                                                         .setIsContactGift(true));
                                             }
 

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

@@ -8,6 +8,7 @@ import android.app.Dialog;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.drawable.AnimationDrawable;
+import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.Handler;
 import android.text.TextUtils;
@@ -80,6 +81,7 @@ import com.yunbao.live.bean.LivePKUserListBean;
 import com.yunbao.live.bean.LiveReceiveGiftBean;
 import com.yunbao.live.bean.OpenParametersModel;
 import com.yunbao.live.dialog.BlowkissDialog;
+import com.yunbao.live.dialog.GiftWallDialog;
 import com.yunbao.live.dialog.NewUserDialog;
 import com.yunbao.live.event.LinkMicTxAccEvent;
 import com.yunbao.live.event.LiveAudienceEvent;
@@ -663,6 +665,8 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                             mLiveRoomViewHolder.setFansNum(fansNum);
                             //红包相关
                             mLiveRoomViewHolder.setRedPackBtnVisible(Integer.parseInt(data.getEnterRoomInfo().getIsred()) == 1);
+                            //礼物墙相关
+                            mLiveRoomViewHolder.setGiftWall(data.getEnterRoomInfo().getGiftWallLightenNumber(), data.getEnterRoomInfo().getGiftWallLightenTotal());
                         }
 
                         //奖池等级
@@ -1903,6 +1907,18 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
 
     }
 
+    public void setAttention(int attention) {
+        if (mLiveRoomViewHolder != null)
+            mLiveRoomViewHolder.setAttention(attention);
+    }
+
+    public void showGiftWall() {
+
+      if (mLiveRoomViewHolder!=null){
+          mLiveRoomViewHolder.showGiftWall();
+      }
+    }
+
     /**
      * 全服喇叭
      *

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <gradient android:angle="90" android:centerColor="#D5C9FF" android:endColor="#E5EBFF" android:startColor="#8C96FF" android:type="linear" />
+        </shape>
+    </item>
+</selector>

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

@@ -0,0 +1,9 @@
+<?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="10dp" />
+            <gradient android:angle="90" android:endColor="#FDFBFF" android:startColor="#F8EEFF" android:type="linear" />
+        </shape>
+    </item>
+</selector>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="112dp" android:height="56dp">
+        <shape android:shape="rectangle">
+            <gradient android:angle="180" android:endColor="#74C7FB" android:startColor="#CD8BFA" android:type="linear" android:useLevel="true" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+</selector>

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

@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:width="112dp" android:height="56dp">
         <shape android:shape="rectangle">
-            <gradient android:type="linear" android:useLevel="true" android:startColor="#ffff9782" android:endColor="#ffffbf8a" android:angle="180" />
+            <gradient android:type="linear" android:useLevel="true" android:startColor="#FE9C54" android:endColor="#FFC764" android:angle="180" />
             <corners android:radius="6dp" />
         </shape>
     </item>

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

@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:width="112dp" android:height="56dp">
         <shape android:shape="rectangle">
-            <gradient android:type="linear" android:useLevel="true" android:startColor="#fffe9afc" android:endColor="#ff8ab3ff" android:angle="180" />
+            <gradient android:type="linear" android:useLevel="true" android:startColor="#B76DFF" android:endColor="#D477EF" android:angle="180" />
             <corners android:radius="6dp" />
         </shape>
     </item>

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

@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:width="112dp" android:height="56dp">
         <shape android:shape="rectangle">
-            <gradient android:type="linear" android:useLevel="true" android:startColor="#ffff8abd" android:endColor="#fffe9aaa" android:angle="180" />
+            <gradient android:type="linear" android:useLevel="true" android:startColor="#F96496" android:endColor="#FFA999" android:angle="180" />
             <corners android:radius="6dp" />
         </shape>
     </item>

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

@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="540dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="522dp"
+            android:layout_alignParentBottom="true"
+            android:background="@mipmap/background_gift_wall"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="27dp"
+                android:gravity="center_vertical">
+
+                <TextView
+                    android:id="@+id/anchor_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="主播昵称"
+                    android:textColor="@color/white"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:id="@+id/attention"
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:layout_marginStart="4dp"
+                    android:src="@mipmap/icon_following_anchor" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:layout_marginStart="6dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="6dp"
+                android:background="@mipmap/background_giftwall_tab">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="@string/codex"
+                    android:textColor="#184DED"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="@string/honorary_achievement"
+                    android:textColor="@color/white"
+                    android:textSize="16sp" />
+            </LinearLayout>
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginStart="15dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginEnd="15dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="4dp"
+                    android:background="@drawable/bg_gift_wall_list"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="41dp">
+
+                        <LinearLayout
+                            android:id="@+id/layout_lit_icon"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/text_lit_icon"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:padding="2dp"
+                                android:text="@string/lit_icon"
+                                android:textColor="#3E68FF"
+                                android:textSize="14sp"
+                                android:textStyle="italic|bold" />
+
+                            <View
+                                android:id="@+id/view_lit_icon"
+                                android:layout_width="18dp"
+                                android:layout_height="5dp"
+                                android:background="@drawable/tablayout_gift_wall" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/layout_unlit_icon"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/text_unlit_icon"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:padding="2dp"
+                                android:text="@string/unlit_icon"
+                                android:textColor="#3E68FF"
+                                android:textSize="14sp"
+                                android:textStyle="italic" />
+
+                            <View
+                                android:id="@+id/view_unlit_icon"
+                                android:layout_width="18dp"
+                                android:layout_height="5dp"
+                                android:background="@drawable/tablayout_gift_wall" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/layout_all_service_champion"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/text_all_service_champion"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:padding="2dp"
+                                android:text="@string/all_service_champion"
+                                android:textColor="#3E68FF"
+                                android:textSize="14sp"
+                                android:textStyle="italic" />
+
+                            <View
+                                android:id="@+id/view_all_service_champion"
+                                android:layout_width="18dp"
+                                android:layout_height="5dp"
+                                android:background="@drawable/tablayout_gift_wall" />
+                        </LinearLayout>
+                    </LinearLayout>
+
+                    <FrameLayout
+                        android:id="@+id/context_layout_gift"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="148dp"
+                    android:layout_height="27dp"
+                    android:layout_gravity="center_horizontal"
+                    android:background="@mipmap/background_gift_wall_title"
+                    android:gravity="center"
+                    android:text="@string/gift_wall"
+                    android:textColor="#3E68FF"
+                    android:textSize="15sp" />
+            </FrameLayout>
+
+        </LinearLayout>
+
+        <com.makeramen.roundedimageview.RoundedImageView
+            android:id="@+id/avatar"
+            android:layout_width="41dp"
+            android:layout_height="41dp"
+            android:layout_centerHorizontal="true"
+            android:scaleType="centerCrop"
+            android:src="@drawable/m_chu_xia"
+            app:riv_oval="true" />
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/regular_bubble"
+        android:layout_width="45dp"
+        android:layout_height="45dp"
+        android:layout_gravity="end"
+        android:layout_marginTop="134dp"
+        android:background="@mipmap/icon_regular_bubble"
+        android:gravity="center"
+        android:textColor="@color/white"
+        android:text="@string/regular_bubble"
+        android:textSize="8sp" />
+
+</FrameLayout>

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

@@ -401,29 +401,32 @@
         </LinearLayout>
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="0dp"
             android:visibility="visible">
 
             <LinearLayout
                 android:id="@+id/user_level_layout"
-                android:layout_width="112dp"
+                android:layout_width="0dp"
-                android:layout_height="56dp"
+                android:layout_height="55dp"
+                android:layout_marginStart="8dp"
+                android:layout_weight="1"
                 android:background="@drawable/bg_user_card_lv"
-                android:gravity="center">
+                android:gravity="center_vertical">
 
                 <ImageView
                     android:id="@+id/live_icon"
-                    android:layout_width="48dp"
+                    android:layout_width="24dp"
-                    android:layout_height="48dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginStart="2dp"
                     android:src="@mipmap/icon_chat_face"
                     android:visibility="visible" />
 
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
                     android:orientation="vertical">
 
                     <TextView
@@ -432,7 +435,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/live_user_level_anchor"
                         android:textColor="#FFFFFF"
-                        android:textSize="12sp" />
+                        android:textSize="11sp" />
 
                     <TextView
                         android:id="@+id/lv_val"
@@ -440,31 +443,75 @@
                         android:layout_height="wrap_content"
                         android:text="Lv.0"
                         android:textColor="#FFFFFF"
-                        android:textSize="14sp" />
+                        android:textSize="9sp" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/gift_wall"
+                android:layout_width="0dp"
+                android:layout_height="55dp"
+                android:layout_marginStart="8dp"
+                android:layout_weight="1"
+                android:background="@drawable/bg_user_card_lv"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:id="@+id/icon_gift_wall"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginStart="2dp"
+                    android:src="@mipmap/icon_chat_face"
+                    android:visibility="visible" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/text_gift_wall"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/live_user_level_anchor"
+                        android:textColor="#FFFFFF"
+                        android:textSize="11sp" />
+
+                    <TextView
+                        android:id="@+id/value_gift_wall"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Lv.0"
+                        android:textColor="#FFFFFF"
+                        android:textSize="9sp" />
                 </LinearLayout>
 
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/noble_icon_layout"
-                android:layout_width="112dp"
+                android:layout_width="0dp"
-                android:layout_height="56dp"
+                android:layout_height="55dp"
-                android:layout_marginStart="10dp"
+                android:layout_marginStart="8dp"
-                android:layout_marginEnd="10dp"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
                 android:background="@mipmap/img_aristocrat_notopen"
-                android:gravity="center">
+                android:gravity="center_vertical">
 
                 <ImageView
                     android:id="@+id/noble_icon"
-                    android:layout_width="48dp"
+                    android:layout_width="24dp"
-                    android:layout_height="48dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginStart="2dp"
                     android:src="@mipmap/img_fans_default"
                     android:visibility="invisible" />
 
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
                     android:orientation="vertical">
 
                     <TextView
@@ -473,7 +520,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/live_noble_level_anchor"
                         android:textColor="#FFFFFF"
-                        android:textSize="12sp" />
+                        android:textSize="11sp" />
 
                     <TextView
                         android:id="@+id/noble_val"
@@ -481,29 +528,32 @@
                         android:layout_height="wrap_content"
                         android:text="Lv.0"
                         android:textColor="#FFFFFF"
-                        android:textSize="14sp" />
+                        android:textSize="9sp" />
                 </LinearLayout>
 
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/honor_layout"
-                android:layout_width="112dp"
+                android:layout_width="0dp"
-                android:layout_height="56dp"
+                android:layout_height="55dp"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
                 android:background="@drawable/bg_user_card_honor"
-                android:gravity="center">
+                android:gravity="center_vertical">
 
                 <ImageView
                     android:id="@+id/honor_icon"
-                    android:layout_width="48dp"
+                    android:layout_width="24dp"
-                    android:layout_height="48dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginStart="2dp"
                     android:src="@mipmap/img_honor_default"
                     android:visibility="visible" />
 
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
                     android:orientation="vertical">
 
                     <TextView
@@ -511,7 +561,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/live_honor_number_anchor"
                         android:textColor="#FFFFFF"
-                        android:textSize="12sp" />
+                        android:textSize="11sp" />
 
                     <TextView
                         android:id="@+id/honor_val"
@@ -519,7 +569,7 @@
                         android:layout_height="wrap_content"
                         android:text="0"
                         android:textColor="#FFFFFF"
-                        android:textSize="14sp" />
+                        android:textSize="9sp" />
                 </LinearLayout>
 
             </LinearLayout>

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

@@ -0,0 +1,190 @@
+<?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="match_parent"
+    android:background="@drawable/background_regular"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/close_btn"
+        android:layout_width="8dp"
+        android:layout_height="14dp"
+        android:layout_marginStart="23dp"
+        android:layout_marginTop="37dp"
+        android:src="@mipmap/icon_regular_black" />
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginStart="15dp"
+        android:layout_marginTop="58dp"
+        android:layout_marginEnd="15dp"
+        android:layout_marginBottom="34dp"
+        android:background="@drawable/background_regular_center">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:paddingStart="11dp"
+            android:paddingEnd="11dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="33dp"
+                android:text="@string/gift_wall_entrance"
+                android:textColor="#1D31FE"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="@string/gift_wall_entrance1"
+                android:textColor="#7480FF"
+                android:textSize="13sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/gift_wall_entrance2"
+                android:textColor="#1D31FE"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="@string/gift_wall_entrance3"
+                android:textColor="#7480FF"
+                android:textSize="13sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/gift_wall_entrance4"
+                android:textColor="#1D31FE"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="@string/gift_wall_entrance5"
+                android:textColor="#7480FF"
+                android:textSize="13sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/codex"
+                android:textColor="#1D31FE"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="@string/gift_wall_entrance6"
+                android:textColor="#7480FF"
+                android:textSize="13sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/gift_wall_entrance7"
+                android:textColor="#1D31FE"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="@string/gift_wall_entrance8_1"
+                android:textColor="#7480FF"
+                android:textSize="13sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/gift_wall_entrance8_2"
+                android:textColor="#7480FF"
+                android:textSize="13sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/gift_wall_entrance8_3"
+                android:textColor="#7480FF"
+                android:textSize="13sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/gift_wall_entrance8_4"
+                android:textColor="#7480FF"
+                android:textSize="13sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/gift_wall_entrance8_5"
+                android:textColor="#7480FF"
+                android:textSize="13sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/gift_wall_entrance8_6"
+                android:textColor="#7480FF"
+                android:textSize="13sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/gift_wall_entrance8_7"
+                android:textColor="#7480FF"
+                android:textSize="13sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/gift_wall_entrance8_8"
+                android:textColor="#7480FF"
+                android:textSize="13sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/gift_wall_entrance8_9"
+                android:textColor="#7480FF"
+                android:textSize="13sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/gift_wall_entrance8_10"
+                android:textColor="#7480FF"
+                android:layout_marginBottom="20dp"
+                android:textSize="13sp" />
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
+    <TextView
+        android:layout_width="142dp"
+        android:layout_height="42dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="28dp"
+        android:background="@mipmap/background_regular_title" />
+</FrameLayout>

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

@@ -351,7 +351,7 @@
     <!--周星榜-->
     <FrameLayout
         android:id="@+id/live_wks_layout"
-        android:layout_width="wrap_content"
+        android:layout_width="70dp"
         android:layout_height="20dp"
         android:layout_alignTop="@id/hour_rank_layout"
         android:layout_marginStart="4dp"
@@ -362,26 +362,44 @@
 
         <LinearLayout
             android:id="@+id/live_wks_layout2"
-            android:layout_width="56dp"
+            android:layout_width="70dp"
             android:layout_height="match_parent"
             android:orientation="horizontal" />
 
-        <ImageView
+        <ViewFlipper
-            android:layout_width="12dp"
+            android:id="@+id/live_wks_and_gift_wall"
-            android:layout_height="12dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="6dp"
-            android:src="@mipmap/live_icon_zhouxing" />
-
-        <TextView
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="20dp"
-            android:layout_gravity="center_vertical"
+            android:layout_marginStart="0dp"
-            android:layout_marginStart="20dp"
+            android:flipInterval="5000"
-            android:layout_marginEnd="6dp"
+            android:inAnimation="@anim/anim_marquee_in"
-            android:text="@string/live_wks"
+            android:outAnimation="@anim/anim_marquee_out" />
-            android:textColor="#FFFFFFFF"
+
-            android:textSize="10sp" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="6dp"
+                android:src="@mipmap/live_icon_zhouxing"
+                android:visibility="gone" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="6dp"
+                android:text="@string/live_wks"
+                android:textColor="#FFFFFFFF"
+                android:textSize="10sp"
+                android:visibility="gone" />
+        </LinearLayout>
+
 
     </FrameLayout>
     <!--心愿单-->

main/src/main/java/com/yunbao/main/activity/MainActivity.java

@@ -162,9 +162,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
     private MainHomeViewHolder mainHomeViewHolder;
     private MainHomeCommunityViewHolder mMainHomeCommunityViewHolder;
     private MainMessageViewHolder mainMessageViewHolder;
-    private MainHomeVideoViewHolder mainHomeVideoViewHolder;
-    private MainHomeShopViewHolder mListShopViewHolder;
-    private ChatListViewHolder mChatListViewHolder;
     private MainMeViewHolder mMeViewHolder;
     private AbsMainViewHolder[] mViewHolders;
     private View mBottom;