update 礼物墙

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

@@ -135,7 +135,7 @@ public class GiftWallMainTab1List2Adapter extends RecyclerView.Adapter<GiftWallM
         @SuppressLint("DefaultLocale")
         public void setData(GiftWallBean.Gift gift, int position) {
             gift_name.setText(WordUtil.isNewZh() ? gift.getGift_name() : gift.getGift_name_en());
-            ImgLoader.display(itemView.getContext(), gift.getGift_icon(), giftImage, 40, 40);
+            //ImgLoader.display(itemView.getContext(), gift.getGift_icon(), giftImage, 40, 40);
             giftBg.setClearsAfterDetached(false);
             giftBg.setClearsAfterStop(false);
             if (gift.getIlluminate_status() == 1) {

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

@@ -38,12 +38,17 @@ public class GiftWallMainTab2ListAdapter extends RecyclerView.Adapter<GiftWallMa
     String toUid;
     boolean isAnchor;
     private boolean isLiveRoom;
+    boolean isNowRank;
 
     public GiftWallMainTab2ListAdapter(Context mContext) {
         this.mContext = mContext;
         list = new ArrayList<>();
     }
 
+    public void setNowRank(boolean nowRank) {
+        isNowRank = nowRank;
+    }
+
     public void setToUid(String toUid) {
         this.toUid = toUid;
     }
@@ -127,7 +132,7 @@ public class GiftWallMainTab2ListAdapter extends RecyclerView.Adapter<GiftWallMa
         @SuppressLint("DefaultLocale")
         public void setData(GiftWallTab2Bean.Gift giftData, int position) {
             gift_name.setText(WordUtil.isNewZh() ? giftData.getGiftName() : giftData.getGiftNameEn());
-            ImgLoader.display(itemView.getContext(), giftData.getGiftIcon(), gift, 60, 60);
+           // ImgLoader.display(itemView.getContext(), giftData.getGiftIcon(), gift, 60, 60);
             if (!StringUtil.isEmpty(giftData.getNamingLiveNicename(), giftData.getNamingUserNicename())) {
                 anchor_nickname.setVisibility(View.VISIBLE);
                 user_nickname.setVisibility(View.VISIBLE);
@@ -141,6 +146,17 @@ public class GiftWallMainTab2ListAdapter extends RecyclerView.Adapter<GiftWallMa
                 ImgLoader.display(mContext, giftData.getNamingUserAvatar(), user2Avatar, 35, 35);
                 anchor_nickname.setText(giftData.getNamingLiveNicename());
                 user_nickname.setText(giftData.getNamingUserNicename());
+                ViewClicksAntiShake.clicksAntiShake(itemView, () -> {
+                    if (isNowRank) {
+                        new GiftWallGiftInfoDialog(mContext, giftData.getGiftId() + "", toUid, isAnchor)
+                                .setFullWindows(!isLiveRoom)
+                                .setLiveRoom(isLiveRoom)
+                                .setStar(isStar)
+                                .showDialog();
+                    } else {
+                        new GiftWallMainTab2ClassicInfoDialog(mContext, giftData, isAnchor).setFullWindows(!isLiveRoom).showDialog();
+                    }
+                });
             } else {
                 user1Avatar.setVisibility(View.GONE);
                 user2Avatar.setVisibility(View.GONE);
@@ -149,21 +165,9 @@ public class GiftWallMainTab2ListAdapter extends RecyclerView.Adapter<GiftWallMa
                 gift_number.setVisibility(View.GONE);
                 imageView8.setVisibility(View.GONE);
                 tv_wait.setVisibility(View.VISIBLE);
-            }
+                itemView.setOnClickListener(null);
-            ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() {
-                @Override
-                public void onViewClicks() {
-                    new GiftWallMainTab2ClassicInfoDialog(mContext, giftData, isAnchor).setFullWindows(!isLiveRoom).show();
-                }
-            });
             }
 
-        private int getSolesrRes() {
-            return isStar ? R.mipmap.gift_wall_main_item_select : R.mipmap.gift_wall_main_item_select1;
-        }
-
-        private int getUnSolesrRes() {
-            return isStar ? R.mipmap.gift_wall_main_item_unselect : R.mipmap.gift_wall_main_item_unselect1;
         }
     }
 }

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

@@ -0,0 +1,79 @@
+package com.yunbao.common.adapter;
+
+import android.graphics.Color;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.makeramen.roundedimageview.RoundedImageView;
+import com.yunbao.common.R;
+import com.yunbao.common.bean.GiftWallInfoBean;
+import com.yunbao.common.bean.GiftWallMainTab2ClassicInfoBean;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.utils.WordUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+public class GiftWallTab2GiftInfoListItemAdapter extends RecyclerView.Adapter<GiftWallTab2GiftInfoListItemAdapter.VH> {
+    List<GiftWallMainTab2ClassicInfoBean.GiftData> data = new ArrayList<>();
+
+    public void setData(List<GiftWallMainTab2ClassicInfoBean.GiftData> data) {
+        if (data == null) {
+            data = new ArrayList<>();
+        }
+        this.data = data;
+        notifyDataSetChanged();
+    }
+
+    @NonNull
+    @Override
+    public VH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new VH(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_dialog_gift_wall_tab2_gift_info, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull VH holder, int position) {
+      //  holder.setData(data.get(position), position);
+    }
+
+    @Override
+    public int getItemCount() {
+       // return data.size();
+        return 20;
+    }
+
+    public class VH extends RecyclerView.ViewHolder {
+        TextView tv_rank, user_name, tv_rename;
+        RoundedImageView avatar;
+
+        public VH(@NonNull View itemView) {
+            super(itemView);
+            tv_rank = itemView.findViewById(R.id.tv_rank);
+            user_name = itemView.findViewById(R.id.user_name);
+            tv_rename = itemView.findViewById(R.id.tv_rename);
+            avatar = itemView.findViewById(R.id.avatar);
+        }
+
+        public void setData(GiftWallMainTab2ClassicInfoBean.GiftData data, int position) {
+            tv_rank.setText(String.format(Locale.getDefault(), "%d", (position + 1)));
+            tv_rank.setTextColor(Color.parseColor("#FCC755"));
+            tv_rank.setTextSize(20);
+            tv_rename.setText(String.format(Locale.getDefault(), "%d", (data.getGiftHallSendNum())));
+            avatar.setVisibility(View.VISIBLE);
+            if (data.getActiveRankHide() == 1) {
+                user_name.setText(WordUtil.getNewString(R.string.mystery_man));
+                avatar.setImageResource(R.mipmap.hide);
+            } else {
+                user_name.setText(data.getUserName());
+                ImgLoader.display(itemView.getContext(), data.getAvatar(), avatar);
+            }
+        }
+
+    }
+}

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

@@ -0,0 +1,428 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class GiftWallMainTab2ClassicInfoBean extends BaseModel{
+    @SerializedName("gift_info")
+    private GiftInfo giftInfo;
+
+    @SerializedName("data")
+    private List<GiftData> data;
+
+    @SerializedName("is_me")
+    private int isMe;
+
+    // 如果需要，可以添加无参构造器、getter和setter（这里省略）
+
+    public GiftInfo getGiftInfo() {
+        return giftInfo;
+    }
+
+    public void setGiftInfo(GiftInfo giftInfo) {
+        this.giftInfo = giftInfo;
+    }
+
+    public List<GiftData> getData() {
+        return data;
+    }
+
+    public void setData(List<GiftData> data) {
+        this.data = data;
+    }
+
+    public int getIsMe() {
+        return isMe;
+    }
+
+    public void setIsMe(int isMe) {
+        this.isMe = isMe;
+    }
+
+    // 内部类：GiftInfo
+    public static class GiftInfo {
+
+        @SerializedName("gift_id")
+        private int giftId;
+
+        @SerializedName("sendtype")
+        private int sendType;
+
+        @SerializedName("gift_name")
+        private String giftName;
+
+        @SerializedName("need_coin")
+        private int needCoin;
+
+        @SerializedName("gift_icon")
+        private String giftIcon;
+
+        @SerializedName("week_star_level")
+        private int weekStarLevel;
+
+        @SerializedName("illuminate_num")
+        private int illuminateNum;
+
+        @SerializedName("gift_hall_type")
+        private int giftHallType;
+
+        @SerializedName("gift_name_en")
+        private String giftNameEn;
+
+        @SerializedName("gift_hall_start")
+        private String giftHallStart;
+
+        @SerializedName("gift_hall_end")
+        private String giftHallEnd;
+
+        @SerializedName("gift_hall_start_date")
+        private String giftHallStartDate;
+
+        @SerializedName("gift_hall_end_date")
+        private String giftHallEndDate;
+
+        @SerializedName("user_gift_hall_send_num")
+        private int userGiftHallSendNum;
+
+        @SerializedName("needcoin_total")
+        private int needcoinTotal;
+
+        @SerializedName("gift_hall_send_num")
+        private int giftHallSendNum;
+
+        @SerializedName("illuminate_status")
+        private int illuminateStatus;
+
+        @SerializedName("naming_live_id")
+        private int namingLiveId;
+
+        @SerializedName("naming_live_nicename")
+        private String namingLiveNicename;
+
+        @SerializedName("naming_live_avatar")
+        private String namingLiveAvatar;
+
+        @SerializedName("naming_live_active_rank_hide")
+        private int namingLiveActiveRankHide;
+
+        @SerializedName("naming_user_id")
+        private int namingUserId;
+
+        @SerializedName("naming_user_nicename")
+        private String namingUserNicename;
+
+        @SerializedName("naming_user_avatar")
+        private String namingUserAvatar;
+
+        @SerializedName("naming_user_active_rank_hide")
+        private int namingUserActiveRankHide;
+
+        // 如果需要，可以添加无参构造器、getter和setter（这里省略）
+
+        public int getGiftId() {
+            return giftId;
+        }
+
+        public void setGiftId(int giftId) {
+            this.giftId = giftId;
+        }
+
+        public int getSendType() {
+            return sendType;
+        }
+
+        public void setSendType(int sendType) {
+            this.sendType = sendType;
+        }
+
+        public String getGiftName() {
+            return giftName;
+        }
+
+        public void setGiftName(String giftName) {
+            this.giftName = giftName;
+        }
+
+        public int getNeedCoin() {
+            return needCoin;
+        }
+
+        public void setNeedCoin(int needCoin) {
+            this.needCoin = needCoin;
+        }
+
+        public String getGiftIcon() {
+            return giftIcon;
+        }
+
+        public void setGiftIcon(String giftIcon) {
+            this.giftIcon = giftIcon;
+        }
+
+        public int getWeekStarLevel() {
+            return weekStarLevel;
+        }
+
+        public void setWeekStarLevel(int weekStarLevel) {
+            this.weekStarLevel = weekStarLevel;
+        }
+
+        public int getIlluminateNum() {
+            return illuminateNum;
+        }
+
+        public void setIlluminateNum(int illuminateNum) {
+            this.illuminateNum = illuminateNum;
+        }
+
+        public int getGiftHallType() {
+            return giftHallType;
+        }
+
+        public void setGiftHallType(int giftHallType) {
+            this.giftHallType = giftHallType;
+        }
+
+        public String getGiftNameEn() {
+            return giftNameEn;
+        }
+
+        public void setGiftNameEn(String giftNameEn) {
+            this.giftNameEn = giftNameEn;
+        }
+
+        public String getGiftHallStart() {
+            return giftHallStart;
+        }
+
+        public void setGiftHallStart(String giftHallStart) {
+            this.giftHallStart = giftHallStart;
+        }
+
+        public String getGiftHallEnd() {
+            return giftHallEnd;
+        }
+
+        public void setGiftHallEnd(String giftHallEnd) {
+            this.giftHallEnd = giftHallEnd;
+        }
+
+        public String getGiftHallStartDate() {
+            return giftHallStartDate;
+        }
+
+        public void setGiftHallStartDate(String giftHallStartDate) {
+            this.giftHallStartDate = giftHallStartDate;
+        }
+
+        public String getGiftHallEndDate() {
+            return giftHallEndDate;
+        }
+
+        public void setGiftHallEndDate(String giftHallEndDate) {
+            this.giftHallEndDate = giftHallEndDate;
+        }
+
+        public int getUserGiftHallSendNum() {
+            return userGiftHallSendNum;
+        }
+
+        public void setUserGiftHallSendNum(int userGiftHallSendNum) {
+            this.userGiftHallSendNum = userGiftHallSendNum;
+        }
+
+        public int getNeedcoinTotal() {
+            return needcoinTotal;
+        }
+
+        public void setNeedcoinTotal(int needcoinTotal) {
+            this.needcoinTotal = needcoinTotal;
+        }
+
+        public int getGiftHallSendNum() {
+            return giftHallSendNum;
+        }
+
+        public void setGiftHallSendNum(int giftHallSendNum) {
+            this.giftHallSendNum = giftHallSendNum;
+        }
+
+        public int getIlluminateStatus() {
+            return illuminateStatus;
+        }
+
+        public void setIlluminateStatus(int illuminateStatus) {
+            this.illuminateStatus = illuminateStatus;
+        }
+
+        public int getNamingLiveId() {
+            return namingLiveId;
+        }
+
+        public void setNamingLiveId(int namingLiveId) {
+            this.namingLiveId = namingLiveId;
+        }
+
+        public String getNamingLiveNicename() {
+            return namingLiveNicename;
+        }
+
+        public void setNamingLiveNicename(String namingLiveNicename) {
+            this.namingLiveNicename = namingLiveNicename;
+        }
+
+        public String getNamingLiveAvatar() {
+            return namingLiveAvatar;
+        }
+
+        public void setNamingLiveAvatar(String namingLiveAvatar) {
+            this.namingLiveAvatar = namingLiveAvatar;
+        }
+
+        public int getNamingLiveActiveRankHide() {
+            return namingLiveActiveRankHide;
+        }
+
+        public void setNamingLiveActiveRankHide(int namingLiveActiveRankHide) {
+            this.namingLiveActiveRankHide = namingLiveActiveRankHide;
+        }
+
+        public int getNamingUserId() {
+            return namingUserId;
+        }
+
+        public void setNamingUserId(int namingUserId) {
+            this.namingUserId = namingUserId;
+        }
+
+        public String getNamingUserNicename() {
+            return namingUserNicename;
+        }
+
+        public void setNamingUserNicename(String namingUserNicename) {
+            this.namingUserNicename = namingUserNicename;
+        }
+
+        public String getNamingUserAvatar() {
+            return namingUserAvatar;
+        }
+
+        public void setNamingUserAvatar(String namingUserAvatar) {
+            this.namingUserAvatar = namingUserAvatar;
+        }
+
+        public int getNamingUserActiveRankHide() {
+            return namingUserActiveRankHide;
+        }
+
+        public void setNamingUserActiveRankHide(int namingUserActiveRankHide) {
+            this.namingUserActiveRankHide = namingUserActiveRankHide;
+        }
+    }
+
+    // 内部类：GiftData
+    public static class GiftData {
+
+        @SerializedName("gift_hall_send_num")
+        private int giftHallSendNum;
+
+        @SerializedName("live_id")
+        private int liveId;
+
+        @SerializedName("live_user_name")
+        private String liveUserName;
+
+        @SerializedName("live_avatar")
+        private String liveAvatar;
+
+        @SerializedName("user_name")
+        private String userName;
+
+        @SerializedName("avatar")
+        private String avatar;
+
+        @SerializedName("user_id")
+        private String userId;
+
+        @SerializedName("active_rank_hide")
+        private int activeRankHide;
+
+        @SerializedName("create_time")
+        private String createTime;
+
+        // 如果需要，可以添加无参构造器、getter和setter（这里省略）
+
+        public int getGiftHallSendNum() {
+            return giftHallSendNum;
+        }
+
+        public void setGiftHallSendNum(int giftHallSendNum) {
+            this.giftHallSendNum = giftHallSendNum;
+        }
+
+        public int getLiveId() {
+            return liveId;
+        }
+
+        public void setLiveId(int liveId) {
+            this.liveId = liveId;
+        }
+
+        public String getLiveUserName() {
+            return liveUserName;
+        }
+
+        public void setLiveUserName(String liveUserName) {
+            this.liveUserName = liveUserName;
+        }
+
+        public String getLiveAvatar() {
+            return liveAvatar;
+        }
+
+        public void setLiveAvatar(String liveAvatar) {
+            this.liveAvatar = liveAvatar;
+        }
+
+        public String getUserName() {
+            return userName;
+        }
+
+        public void setUserName(String userName) {
+            this.userName = userName;
+        }
+
+        public String getAvatar() {
+            return avatar;
+        }
+
+        public void setAvatar(String avatar) {
+            this.avatar = avatar;
+        }
+
+        public String getUserId() {
+            return userId;
+        }
+
+        public void setUserId(String userId) {
+            this.userId = userId;
+        }
+
+        public int getActiveRankHide() {
+            return activeRankHide;
+        }
+
+        public void setActiveRankHide(int activeRankHide) {
+            this.activeRankHide = activeRankHide;
+        }
+
+        public String getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(String createTime) {
+            this.createTime = createTime;
+        }
+    }
+}

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

@@ -5,6 +5,7 @@ import androidx.annotation.NonNull;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.annotations.SerializedName;
+import com.yunbao.common.utils.StringUtil;
 
 /**
  * 联系方式
@@ -141,14 +142,14 @@ public class LiveAnchorCallMeModel extends BaseModel {
 
     public static class AppBean {
         private String number;
-        private int isShow;
+        private String isShow;
 
         public AppBean() {
         }
 
         public AppBean(String number, int isShow) {
             this.number = number;
-            this.isShow = isShow;
+            this.isShow = isShow + "";
         }
 
         public String getNumber() {
@@ -160,11 +161,14 @@ public class LiveAnchorCallMeModel extends BaseModel {
         }
 
         public int getIsShow() {
-            return isShow;
+            if (StringUtil.isEmpty(isShow)) {
+                return 0;
+            }
+            return Integer.parseInt(isShow);
         }
 
         public void setIsShow(int isShow) {
-            this.isShow = isShow;
+            this.isShow = isShow + "";
         }
 
         @NonNull

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

@@ -12,15 +12,23 @@ import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
 
 import com.lxj.xpopup.XPopup;
+import com.makeramen.roundedimageview.RoundedImageView;
 import com.yunbao.common.R;
+import com.yunbao.common.adapter.GiftWallTab2GiftInfoListItemAdapter;
+import com.yunbao.common.bean.GiftWallMainTab2ClassicInfoBean;
 import com.yunbao.common.bean.GiftWallTab2Bean;
+import com.yunbao.common.custom.ItemDecoration;
 import com.yunbao.common.fragment.BaseFragment;
 import com.yunbao.common.fragment.GiftWallMainTab1Fragment;
 import com.yunbao.common.fragment.GiftWallMainTab2Fragment;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.ScreenDimenUtil;
 import com.yunbao.common.utils.WordUtil;
@@ -36,12 +44,21 @@ public class GiftWallMainTab2ClassicInfoDialog  extends AbsDialogPopupWindow {
     private ImageView mIvBg;
     private ImageView mIvTips;
     private ImageView mIvBack;
-    private CustomEllipsizeTextView mTvUserName;
+    private ImageView mIvGift;
+    private RoundedImageView user_avatar;
+    private TextView mTvUserName;
+    private TextView star_value;
+    private RoundedImageView user_avatar_1, user_avatar_2, user_avatar_3;
+    private TextView user_name_1, user_name_2, user_name_3;
+    private TextView user_value_1, user_value_2, user_value_3;
+    private TextView gift_name;
     private View mAchievement;
     private TextView mTvTab1, mTvTab2;
     private ViewPager2 mViewPager;
     private LinearLayout mIvTabsLayout;
     private List<BaseFragment> fragments = new ArrayList<>();
+    private RecyclerView recyclerView;
+    GiftWallTab2GiftInfoListItemAdapter adapter;
 
     private boolean isFullWindows;
     GiftWallTab2Bean.Gift gift;
@@ -52,6 +69,7 @@ public class GiftWallMainTab2ClassicInfoDialog  extends AbsDialogPopupWindow {
         super(context);
         this.gift = gift;
         this.isAnchor = isAnchor;
+
     }
 
     public GiftWallMainTab2ClassicInfoDialog setFullWindows(boolean fullWindows) {
@@ -78,22 +96,77 @@ public class GiftWallMainTab2ClassicInfoDialog  extends AbsDialogPopupWindow {
         return (int) (screenHeight * 0.8);
     }
 
+    void initData() {
+        LiveNetManager.get(mContext)
+                .lastAllGiftHallWeekStarDetail(gift.getGiftId() + "", gift.getNamingLiveId() + "", new HttpCallback<GiftWallMainTab2ClassicInfoBean>() {
+                    @Override
+                    public void onSuccess(GiftWallMainTab2ClassicInfoBean data) {
+                        initData(data);
+                    }
+
+                    @Override
+                    public void onError(String error) {
+
+                    }
+                });
+    }
+
+    void initData(GiftWallMainTab2ClassicInfoBean data) {
+        ImgLoader.display(mContext, data.getGiftInfo().getGiftIcon(), mIvGift);
+        ImgLoader.display(mContext, data.getGiftInfo().getNamingLiveAvatar(), user_avatar);
+        gift_name.setText(WordUtil.isNewZh() ? data.getGiftInfo().getGiftName() : data.getGiftInfo().getGiftNameEn());
+        mTvUserName.setText(data.getGiftInfo().getNamingLiveNicename());
+        star_value.setText(String.format(Locale.getDefault(), "%d", data.getGiftInfo().getNeedcoinTotal()));
+        adapter.setData(data.getData());
+        for (int i = 0; i < data.getData().size() && i < 3; i++) {
+            switch (i) {
+                case 0:
+                    setTopData(data.getData().get(0), user_avatar_1, user_name_1, user_value_1);
+                    break;
+                case 1:
+                    setTopData(data.getData().get(1), user_avatar_2, user_name_2, user_value_2);
+                    break;
+                case 2:
+                    setTopData(data.getData().get(2), user_avatar_3, user_name_3, user_value_3);
+                    break;
+            }
+        }
+    }
+
+    void setTopData(GiftWallMainTab2ClassicInfoBean.GiftData data, ImageView avatar, TextView name, TextView value) {
+        ImgLoader.display(mContext, data.getAvatar(), avatar);
+        name.setText(data.getUserName());
+        value.setText(String.format(Locale.getDefault(), "%d", data.getGiftHallSendNum()));
+    }
+
     void initView() {
         mIvBg = findViewById(R.id.iv_root_bg);
         mIvTips = findViewById(R.id.v_tips);
         mIvBack = findViewById(R.id.iv_back);
-        mTvUserName = findViewById(R.id.user_name);
+        mTvUserName = findViewById(R.id.anchor_name);
         mAchievement = findViewById(R.id.v_achievement);
         mTvTab1 = findViewById(R.id.tab1);
         mTvTab2 = findViewById(R.id.tab2);
         mViewPager = findViewById(R.id.viewPager2);
         mIvTabsLayout = findViewById(R.id.tab_layout);
-
+        mIvGift = findViewById(R.id.gift);
-        mTvUserName.setText(String.format(Locale.getDefault(), "%s%s",
+        gift_name = findViewById(R.id.gift_name);
-                userName,
+        user_avatar = findViewById(R.id.user_avatar);
-                WordUtil.isNewZh() ? "的禮物展館" : "'s Gift Hall"
+        star_value = findViewById(R.id.star_value);
-        ));
+        user_avatar_1 = findViewById(R.id.user_avatar_1);
-
+        user_avatar_2 = findViewById(R.id.user_avatar_2);
+        user_avatar_3 = findViewById(R.id.user_avatar_3);
+        user_name_1 = findViewById(R.id.user_name_1);
+        user_name_2 = findViewById(R.id.user_name_2);
+        user_name_3 = findViewById(R.id.user_name_3);
+        user_value_1 = findViewById(R.id.user_value_1);
+        user_value_2 = findViewById(R.id.user_value_2);
+        user_value_3 = findViewById(R.id.user_value_3);
+        recyclerView = findViewById(R.id.recycler_view);
+        adapter = new GiftWallTab2GiftInfoListItemAdapter();
+        recyclerView.setAdapter(adapter);
+        recyclerView.addItemDecoration(new ItemDecoration(mContext, 0x000, 0, 2));
+        initData();
     }
 
     @Override

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

@@ -181,9 +181,6 @@ public class GiftWallMainTab1Fragment extends BaseFragment {
             show_time_layout.setVisibility(View.GONE);
             star_layout.setVisibility(View.GONE);
         }
-        if (!isLiveRoom) {
-
-        }
 
 
         ViewClicksAntiShake.clicksAntiShake(spinner, new ViewClicksAntiShake.ViewClicksCallBack() {

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

@@ -98,6 +98,8 @@ public class GiftWallMainTab2Fragment extends BaseFragment {
         list2Adapter.setToUid(toUserId);
         list1Adapter.setAnchor(isAnchor);
         list2Adapter.setAnchor(isAnchor);
+        list1Adapter.setLiveRoom(isLiveRoom);
+        list2Adapter.setLiveRoom(isLiveRoom);
         list1Adapter.setStar(true);
 
         recyclerView1.setAdapter(list1Adapter);
@@ -123,11 +125,6 @@ public class GiftWallMainTab2Fragment extends BaseFragment {
                     public Boolean invoke(View itemView, Integer index, Boolean select, Boolean fromUser) {
                         //当需要选中itemView时, 触发的回调.
                         //返回true, 拦截库中的默认处理.
-                        setDslTabColor(index == 1 ? dslTab1 : dslTab2, index == 0 ? dslTab1 : dslTab2);
-                        type = (index + 1);
-                        screen=0;
-                        spinnerText.setText(R.string.dialog_gift_wall_list_spinner_all);
-                        initData();
                         return false;
                     }
                 });
@@ -136,6 +133,7 @@ public class GiftWallMainTab2Fragment extends BaseFragment {
                     public Unit invoke(View fromView, List<? extends View> selectViewList, Boolean select, Boolean fromUser) {
                         //fromView 表示之前选中的view, 多选模式不支持.
                         //selectViewList 表示目前选中view的集合, 单选模式列表里面只有一个,可以使用selectViewList.get(0)获取.
+
                         return null;
                     }
                 });
@@ -144,6 +142,18 @@ public class GiftWallMainTab2Fragment extends BaseFragment {
                     public Unit invoke(Integer fromIndex, List<Integer> selectIndexList, Boolean select, Boolean fromUser) {
                         //参考setOnSelectViewChange
                         //只不过对象从view,变成了view在ViewGroup中的索引
+                        if (fromIndex == 0) {
+                            fromIndex = 1;
+                        } else {
+                            fromIndex = 0;
+                        }
+                        setDslTabColor(fromIndex == 0 ? dslTab1 : dslTab2, fromIndex == 1 ? dslTab1 : dslTab2);
+                        type = (fromIndex + 1);
+                        list1Adapter.setNowRank(fromIndex == 0);
+                        screen = 0;
+                        spinnerText.setText(R.string.dialog_gift_wall_list_spinner_all);
+                        initData();
+
                         return null;
                     }
                 });

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

@@ -29,6 +29,7 @@ import com.yunbao.common.bean.GiftNamingInfoModel;
 import com.yunbao.common.bean.GiftWallBean;
 import com.yunbao.common.bean.GiftWallGiftDetail;
 import com.yunbao.common.bean.GiftWallInfoBean;
+import com.yunbao.common.bean.GiftWallMainTab2ClassicInfoBean;
 import com.yunbao.common.bean.GiftWallModel;
 import com.yunbao.common.bean.GiftWallTab2Bean;
 import com.yunbao.common.bean.GuardGetGuardOpenInfoModel;
@@ -1322,4 +1323,9 @@ public interface PDLiveApi {
     Observable<ResponseModel<GiftWallTab2Bean>> allGiftHall(
             @Query("type")String type
     );
+    @GET("/api/public/?service=Gift.lastAllGiftHallWeekStarDetail")
+    Observable<ResponseModel<GiftWallMainTab2ClassicInfoBean>> lastAllGiftHallWeekStarDetail(
+            @Query("gift_id")String giftId,
+            @Query("live_uid")String liveUid
+    );
 }

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

@@ -32,6 +32,7 @@ import com.yunbao.common.bean.GiftNamingInfoModel;
 import com.yunbao.common.bean.GiftWallBean;
 import com.yunbao.common.bean.GiftWallGiftDetail;
 import com.yunbao.common.bean.GiftWallInfoBean;
+import com.yunbao.common.bean.GiftWallMainTab2ClassicInfoBean;
 import com.yunbao.common.bean.GiftWallModel;
 import com.yunbao.common.bean.GiftWallTab2Bean;
 import com.yunbao.common.bean.GuardGetGuardOpenInfoModel;
@@ -3241,6 +3242,7 @@ public class LiveNetManager {
 
     /**
      * 上报日志相关
+     *
      * @param type     1为查询，3为删除
      * @param callback
      */
@@ -3264,6 +3266,7 @@ public class LiveNetManager {
                 }).isDisposed();
 
     }
+
     public void singleUserGiftHall(String userId, int screen, HttpCallback<GiftWallBean> callback) {
         API.get().pdLiveApi(mContext)
                 .singleUserGiftHall(userId, screen)
@@ -3284,6 +3287,7 @@ public class LiveNetManager {
                 }).isDisposed();
 
     }
+
     public void liveGiftHall(String userId, int screen, HttpCallback<GiftWallBean> callback) {
         API.get().pdLiveApi(mContext)
                 .liveGiftHall(userId, screen)
@@ -3304,6 +3308,7 @@ public class LiveNetManager {
                 }).isDisposed();
 
     }
+
     public void singleUserGiftHallDetail(String userId, String giftId, HttpCallback<GiftWallInfoBean> callback) {
         API.get().pdLiveApi(mContext)
                 .singleUserGiftHallDetail(userId, giftId)
@@ -3324,6 +3329,7 @@ public class LiveNetManager {
                 }).isDisposed();
 
     }
+
     public void liveGiftHallDetail(String liveId, String giftId, int gift_hall_type, int list_type, HttpCallback<GiftWallInfoBean> callback) {
         API.get().pdLiveApi(mContext)
                 .liveGiftHallDetail(liveId, giftId, gift_hall_type, list_type)
@@ -3344,6 +3350,7 @@ public class LiveNetManager {
                 }).isDisposed();
 
     }
+
     public void allGiftHall(String type, HttpCallback<GiftWallTab2Bean> callback) {
         API.get().pdLiveApi(mContext)
                 .allGiftHall(type)
@@ -3365,6 +3372,27 @@ public class LiveNetManager {
 
     }
 
+    public void lastAllGiftHallWeekStarDetail(String giftId, String liveUid, HttpCallback<GiftWallMainTab2ClassicInfoBean> callback) {
+        API.get().pdLiveApi(mContext)
+                .lastAllGiftHallWeekStarDetail(giftId, liveUid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(listResponseModel -> {
+                    if (callback != null) {
+                        callback.onSuccess(listResponseModel.getData().getInfo());
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        throwable.printStackTrace();
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+
+    }
+
     public void updateFile(File file, HttpCallback<AvatarBean> callback) {
         MultipartBody.Part uploadFile = createUploadFile(file);
         API.get().pdLiveApi(mContext)

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

@@ -20,17 +20,9 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0" />
 
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/viewPager2"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
     <ImageView
         android:id="@+id/iv_back"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="15dp"
         android:layout_marginTop="21dp"
@@ -39,6 +31,25 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:fillViewport="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
                 <ImageView
                     android:id="@+id/imageView6"
                     android:layout_width="wrap_content"
@@ -74,35 +85,57 @@
                     app:srcCompat="@mipmap/img_honor_default" />
 
                 <TextView
-        android:id="@+id/user_name"
+                    android:id="@+id/anchor_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
                     android:text="TextView"
                     android:textColor="#FFD3A4"
                     android:textSize="16sp"
-        app:layout_constraintEnd_toEndOf="@+id/user_avatar"
+                    app:layout_constraintEnd_toEndOf="@+id/user_avatar_container"
                     app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="@+id/user_avatar"
+                    app:layout_constraintStart_toStartOf="@+id/user_avatar_container"
-        app:layout_constraintTop_toBottomOf="@+id/user_avatar" />
+                    app:layout_constraintTop_toBottomOf="@+id/user_avatar_container" />
 
-    <ImageView
+                <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/user_avatar"
+                    android:id="@+id/user_avatar_container"
                     android:layout_width="65dp"
                     android:layout_height="65dp"
                     android:layout_marginStart="48dp"
                     android:layout_marginBottom="15dp"
                     app:layout_constraintBottom_toBottomOf="@+id/imageView6"
                     app:layout_constraintStart_toEndOf="@+id/imageView6"
-        app:layout_constraintTop_toTopOf="@+id/imageView6"
+                    app:layout_constraintTop_toTopOf="@+id/imageView6">
+
+                    <ImageView
+                        android:id="@+id/user_avatar_tmp"
+                        android:layout_width="65dp"
+                        android:layout_height="65dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
                         app:srcCompat="@mipmap/gift_wall_tab2_classic_info_avatar2" />
 
+                    <com.makeramen.roundedimageview.RoundedImageView
+                        android:id="@+id/user_avatar"
+                        android:layout_width="65dp"
+                        android:layout_height="65dp"
+                        android:src="@mipmap/icon_avatar_placeholder"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:riv_oval="true" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+
                 <TextView
                     android:id="@+id/tv_star"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-        android:layout_marginTop="70dp"
+                    android:layout_marginTop="55dp"
-        android:text="TextView"
+                    android:text="@string/dialog_gift_wall_list_info_list_header_rename_value1"
                     android:textColor="#EEFFF8"
                     android:textSize="14sp"
                     android:textStyle="bold"
@@ -123,17 +156,115 @@
 
                 <ImageView
                     android:id="@+id/imageView7"
-        android:layout_width="wrap_content"
+                    android:layout_width="214dp"
-        android:layout_height="wrap_content"
+                    android:layout_height="25dp"
-        android:layout_marginTop="17dp"
+                    android:layout_marginTop="10dp"
                     app:layout_constraintEnd_toEndOf="@+id/star_value"
                     app:layout_constraintStart_toStartOf="@+id/star_value"
                     app:layout_constraintTop_toBottomOf="@+id/star_value"
                     app:srcCompat="@mipmap/gift_wall_tab2_classic_info_tips" />
 
+                <LinearLayout
+                    android:id="@+id/topLayout"
+                    android:layout_width="0dp"
+
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:gravity="bottom|center"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/imageView7">
+
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/two_layout"
+                        android:layout_width="118dp"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintBottom_toBottomOf="@+id/one_layout"
+                        app:layout_constraintEnd_toStartOf="@+id/one_layout"
+                        app:layout_constraintStart_toStartOf="parent">
+
+                        <ImageView
+                            android:id="@+id/imageView17"
+                            android:layout_width="0dp"
+                            android:layout_height="0dp"
+                            android:adjustViewBounds="true"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:srcCompat="@mipmap/gift_wall_tab2_classic_info_bg_two" />
+
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/userAvatar2Layout"
+                            android:layout_width="58dp"
+                            android:layout_height="58dp"
+                            android:layout_marginTop="41dp"
+                            android:layout_marginEnd="10dp"
+                            android:layout_marginBottom="10dp"
+                            android:background="@mipmap/gift_wall_tab2_classic_info_avatar1"
+                            app:layout_constraintBottom_toTopOf="@+id/imageView12"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent">
+
+                            <com.makeramen.roundedimageview.RoundedImageView
+                                android:id="@+id/user_avatar_2"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginEnd="1dp"
+                                android:src="@mipmap/icon_avatar_placeholder"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:riv_oval="true" />
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        <ImageView
+                            android:id="@+id/imageView12"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="5dp"
+                            app:layout_constraintBottom_toTopOf="@+id/user_name_2"
+                            app:layout_constraintEnd_toEndOf="@+id/userAvatar2Layout"
+                            app:layout_constraintStart_toStartOf="@+id/userAvatar2Layout"
+                            app:srcCompat="@mipmap/gift_wall_tab2_classic_info_twwo" />
+
+                        <TextView
+                            android:id="@+id/user_name_2"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="10dp"
+                            android:ellipsize="end"
+                            android:gravity="center"
+                            android:maxLines="1"
+                            android:text="TextView"
+                            android:textColor="#FFFFFF"
+                            android:textSize="14sp"
+                            app:layout_constraintBottom_toTopOf="@+id/user_value_2"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent" />
+
+                        <TextView
+                            android:id="@+id/user_value_2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="0dp"
+                            android:layout_marginBottom="5dp"
+                            android:text="TextView"
+                            android:textColor="#FFFFFF"
+                            android:textSize="20sp"
+                            app:layout_constraintBottom_toBottomOf="@+id/imageView17"
+                            app:layout_constraintEnd_toEndOf="@+id/user_name_2"
+                            app:layout_constraintStart_toStartOf="@+id/user_name_2" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/one_layout"
-        android:layout_width="wrap_content"
+                        android:layout_width="107dp"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="18dp"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -142,23 +273,23 @@
 
                         <ImageView
                             android:id="@+id/imageView9"
-            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
+                            android:adjustViewBounds="true"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
                             app:srcCompat="@mipmap/gift_wall_tab2_classic_info_bg_one" />
 
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:id="@+id/userAvatar1Layout"
                             android:layout_width="70dp"
                             android:layout_height="70dp"
-            android:layout_marginTop="50dp"
+                            android:layout_marginBottom="10dp"
                             android:background="@mipmap/gift_wall_tab2_classic_info_avatar1"
+                            app:layout_constraintBottom_toTopOf="@+id/imageView11"
                             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintStart_toStartOf="parent">
-            app:layout_constraintTop_toTopOf="parent">
 
                             <com.makeramen.roundedimageview.RoundedImageView
                                 android:id="@+id/user_avatar_1"
@@ -176,127 +307,71 @@
                             android:id="@+id/imageView11"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_marginBottom="10dp"
+                            app:layout_constraintBottom_toTopOf="@+id/user_name_1"
                             app:layout_constraintEnd_toEndOf="@+id/userAvatar1Layout"
                             app:layout_constraintStart_toStartOf="@+id/userAvatar1Layout"
-            app:layout_constraintTop_toBottomOf="@+id/userAvatar1Layout"
                             app:srcCompat="@mipmap/gift_wall_tab2_classic_info_one" />
 
                         <TextView
                             android:id="@+id/user_name_1"
-            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+                            android:layout_marginStart="5dp"
+                            android:layout_marginEnd="5dp"
+                            android:ellipsize="end"
+                            android:gravity="center"
+                            android:maxLines="1"
                             android:text="TextView"
                             android:textColor="#FFFFFF"
                             android:textSize="14sp"
-            app:layout_constraintEnd_toEndOf="@+id/imageView11"
+                            app:layout_constraintBottom_toTopOf="@+id/user_value_1"
-            app:layout_constraintStart_toStartOf="@+id/imageView11"
+                            app:layout_constraintEnd_toEndOf="@+id/imageView9"
-            app:layout_constraintTop_toBottomOf="@+id/imageView11" />
+                            app:layout_constraintStart_toStartOf="@+id/imageView9" />
 
                         <TextView
                             android:id="@+id/user_value_1"
                             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+                            android:layout_height="0dp"
+                            android:layout_marginBottom="5dp"
                             android:text="TextView"
                             android:textColor="#FFFFFF"
                             android:textSize="20sp"
+                            app:layout_constraintBottom_toBottomOf="@+id/imageView9"
                             app:layout_constraintEnd_toEndOf="@+id/user_name_1"
-            app:layout_constraintStart_toStartOf="@+id/user_name_1"
+                            app:layout_constraintStart_toStartOf="@+id/user_name_1" />
-            app:layout_constraintTop_toBottomOf="@+id/user_name_1" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/two_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="@+id/one_layout"
-        app:layout_constraintEnd_toStartOf="@+id/one_layout">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@mipmap/gift_wall_tab2_classic_info_bg_two" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/userAvatar2Layout"
-            android:layout_width="58dp"
-            android:layout_height="58dp"
-            android:layout_marginTop="30dp"
-            android:background="@mipmap/gift_wall_tab2_classic_info_avatar1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <com.makeramen.roundedimageview.RoundedImageView
-                android:id="@+id/user_avatar_2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@mipmap/icon_avatar_placeholder"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:riv_oval="true" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-        <ImageView
-            android:id="@+id/imageView12"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="@+id/userAvatar2Layout"
-            app:layout_constraintStart_toStartOf="@+id/userAvatar2Layout"
-            app:layout_constraintTop_toBottomOf="@+id/userAvatar2Layout"
-            app:srcCompat="@mipmap/gift_wall_tab2_classic_info_twwo" />
-
-        <TextView
-            android:id="@+id/user_name_2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="TextView"
-            android:textColor="#FFFFFF"
-            android:textSize="14sp"
-            app:layout_constraintEnd_toEndOf="@+id/imageView12"
-            app:layout_constraintStart_toStartOf="@+id/imageView12"
-            app:layout_constraintTop_toBottomOf="@+id/imageView12" />
-
-        <TextView
-            android:id="@+id/user_value_2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="TextView"
-            android:textColor="#FFFFFF"
-            android:textSize="20sp"
-            app:layout_constraintEnd_toEndOf="@+id/user_name_2"
-            app:layout_constraintStart_toStartOf="@+id/user_name_2"
-            app:layout_constraintTop_toBottomOf="@+id/user_name_2" />
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/three_layout"
-        android:layout_width="wrap_content"
+                        android:layout_width="115dp"
                         android:layout_height="wrap_content"
+                        android:layout_marginEnd="15dp"
                         app:layout_constraintBottom_toBottomOf="@+id/one_layout"
+                        app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toEndOf="@+id/one_layout">
 
                         <ImageView
-            android:layout_width="wrap_content"
+                            android:id="@+id/imageView16"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
+                            android:adjustViewBounds="true"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
                             app:srcCompat="@mipmap/gift_wall_tab2_classic_info_bg_three" />
 
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:id="@+id/userAvatar3Layout"
                             android:layout_width="44dp"
                             android:layout_height="44dp"
-            android:layout_marginTop="30dp"
+                            android:layout_marginStart="10dp"
+                            android:layout_marginTop="39dp"
+                            android:layout_marginBottom="10dp"
                             android:background="@mipmap/gift_wall_tab2_classic_info_avatar1"
+                            app:layout_constraintBottom_toTopOf="@+id/imageView13"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent">
@@ -312,37 +387,88 @@
                                 app:layout_constraintTop_toTopOf="parent"
                                 app:riv_oval="true" />
                         </androidx.constraintlayout.widget.ConstraintLayout>
+
                         <ImageView
                             android:id="@+id/imageView13"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_marginBottom="3dp"
+                            app:layout_constraintBottom_toTopOf="@+id/user_name_3"
                             app:layout_constraintEnd_toEndOf="@+id/userAvatar3Layout"
                             app:layout_constraintStart_toStartOf="@+id/userAvatar3Layout"
-            app:layout_constraintTop_toBottomOf="@+id/userAvatar3Layout"
                             app:srcCompat="@mipmap/gift_wall_tab2_classic_info_three" />
 
                         <TextView
                             android:id="@+id/user_name_3"
-            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+                            android:layout_marginStart="10dp"
+                            android:ellipsize="end"
+                            android:gravity="center"
+                            android:maxLines="1"
                             android:text="TextView"
                             android:textColor="#FFFFFF"
                             android:textSize="14sp"
-            app:layout_constraintEnd_toEndOf="@+id/imageView13"
+                            app:layout_constraintBottom_toTopOf="@+id/user_value_3"
-            app:layout_constraintStart_toStartOf="@+id/imageView13"
+                            app:layout_constraintEnd_toEndOf="@+id/imageView16"
-            app:layout_constraintTop_toBottomOf="@+id/imageView13" />
+                            app:layout_constraintStart_toStartOf="@+id/imageView16" />
 
                         <TextView
                             android:id="@+id/user_value_3"
                             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+                            android:layout_height="0dp"
+                            android:layout_marginBottom="5dp"
                             android:text="TextView"
                             android:textColor="#FFFFFF"
                             android:textSize="20sp"
+                            app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="@+id/user_name_3"
-            app:layout_constraintStart_toStartOf="@+id/user_name_3"
+                            app:layout_constraintStart_toStartOf="@+id/user_name_3" />
-            app:layout_constraintTop_toBottomOf="@+id/user_name_3" />
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
+                </LinearLayout>
+
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="14dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginEnd="14dp"
+                    android:background="@mipmap/gift_wall_tab2_classic_info_list_bg"
+                    android:fillViewport="true"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/topLayout">
+
+                    <include
+                        android:id="@+id/list_title"
+                        layout="@layout/item_dialog_gift_wall_gift_info"
+                        android:layout_width="0dp"
+                        android:layout_height="50dp"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginEnd="10dp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/recycler_view"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="5dp"
+                        android:layout_marginEnd="7dp"
+                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/list_title"
+                        tools:itemCount="50"
+                        tools:listitem="@layout/item_dialog_gift_wall_tab2_gift_info" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/tv_rank"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="start"
+        android:text="@string/dialog_gift_wall_list_info_list_header_rank"
+        android:textColor="#FFD9B0"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/avatar_layout"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_rank"
+        app:layout_constraintEnd_toStartOf="@+id/user_name"
+        app:layout_constraintStart_toEndOf="@+id/tv_rank"
+        app:layout_constraintTop_toTopOf="@+id/tv_rank"
+        android:layout_width="37dp"
+        android:layout_height="37dp"
+        >
+        <ImageView
+            android:id="@+id/user_avatar_tmp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@mipmap/gift_wall_tab2_classic_info_avatar1" />
+
+        <com.makeramen.roundedimageview.RoundedImageView
+            android:id="@+id/avatar"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_alignParentBottom="true"
+            android:scaleType="centerCrop"
+            android:src="@mipmap/icon_avatar_placeholder"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:riv_oval="true"
+            tools:visibility="visible" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    <TextView
+        android:id="@+id/user_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:textColor="#FFD3A4"
+        android:textSize="13sp"
+        android:text="@string/dialog_gift_wall_list_info_list_header_rename"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_rename"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#FFD3A4"
+        android:textSize="12sp"
+        android:gravity="end"
+        android:layout_marginTop="10dp"
+        android:text="@string/dialog_gift_wall_list_info_list_header_rename_value"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>