diff --git a/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab1List2Adapter.java b/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab1List2Adapter.java
index 459f9d9f7..d066c650c 100644
--- a/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab1List2Adapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab1List2Adapter.java
@@ -114,6 +114,15 @@ public class GiftWallMainTab1List2Adapter extends RecyclerView.Adapter<GiftWallM
         this.isLiveRoom = isLiveRoom;
     }
 
+    public void addList(List<GiftWallBean.Gift> gifts) {
+        if (list == null) {
+            list = new ArrayList<>();
+        }
+        int index=list.size()-1;
+        list.addAll(gifts);
+        notifyItemRangeChanged(index, gifts.size());
+    }
+
     public class VH extends RecyclerView.ViewHolder {
         SVGAImageView giftBg;
         ImageView gift_soles;
@@ -135,7 +144,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) {
diff --git a/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab2ListAdapter.java b/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab2ListAdapter.java
index d355f4d35..90b5bd623 100644
--- a/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab2ListAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab2ListAdapter.java
@@ -3,6 +3,7 @@ package com.yunbao.common.adapter;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,8 +12,17 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.RequestBuilder;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.DecodeFormat;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
 import com.makeramen.roundedimageview.RoundedImageView;
 import com.opensource.svgaplayer.SVGADrawable;
 import com.opensource.svgaplayer.SVGAImageView;
@@ -20,9 +30,13 @@ import com.opensource.svgaplayer.SVGAVideoEntity;
 import com.yunbao.common.R;
 import com.yunbao.common.bean.GiftWallBean;
 import com.yunbao.common.bean.GiftWallTab2Bean;
+import com.yunbao.common.bean.JsWishBean;
 import com.yunbao.common.dialog.GiftWallGiftInfoDialog;
 import com.yunbao.common.dialog.GiftWallMainTab2ClassicInfoDialog;
+import com.yunbao.common.dialog.GiftWallTab2List2Dialog;
+import com.yunbao.common.event.ClosePopupDialogEvent;
 import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -65,6 +79,15 @@ public class GiftWallMainTab2ListAdapter extends RecyclerView.Adapter<GiftWallMa
         notifyDataSetChanged();
     }
 
+    public void addList(List<GiftWallTab2Bean.Gift> gifts) {
+        if (list == null) {
+            list = new ArrayList<>();
+        }
+        int index = list.size() - 1;
+        list.addAll(gifts);
+        notifyItemRangeChanged(index, gifts.size());
+    }
+
 
     public void setStar(boolean star) {
         isStar = star;
@@ -105,6 +128,11 @@ public class GiftWallMainTab2ListAdapter extends RecyclerView.Adapter<GiftWallMa
         this.isLiveRoom = isLiveRoom;
     }
 
+    public void clear() {
+        list.clear();
+        notifyDataSetChanged();
+    }
+
     public class VH extends RecyclerView.ViewHolder {
         ImageView gift;
         TextView gift_name;
@@ -132,7 +160,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);
+            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);
@@ -142,21 +170,10 @@ public class GiftWallMainTab2ListAdapter extends RecyclerView.Adapter<GiftWallMa
                 imageView8.setVisibility(View.VISIBLE);
                 tv_wait.setVisibility(View.GONE);
                 gift_number.setText(String.format(Locale.getDefault(), "%d", giftData.getNeedCoinTotal()));
-                //ImgLoader.display(mContext, giftData.getNamingLiveAvatar(), user1Avatar, 35, 35);
-               // ImgLoader.display(mContext, giftData.getNamingUserAvatar(), user2Avatar, 35, 35);
+                display(mContext, giftData.getNamingLiveAvatar(), user1Avatar, 35, 35);
+                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);
@@ -167,6 +184,58 @@ public class GiftWallMainTab2ListAdapter extends RecyclerView.Adapter<GiftWallMa
                 tv_wait.setVisibility(View.VISIBLE);
                 itemView.setOnClickListener(null);
             }
+            ViewClicksAntiShake.clicksAntiShake(itemView, () -> {
+                if (isStar) {
+                    if (isNowRank) {
+                        if (StringUtil.isEmpty(giftData.getNamingLiveNicename(), giftData.getNamingUserNicename())&&isLiveRoom) {
+                            Bus.get().post(new JsWishBean(giftData.getGiftId() + ""));
+                            Bus.get().post(new ClosePopupDialogEvent());
+                        } else {
+                            new GiftWallGiftInfoDialog(mContext, giftData.getGiftId() + "", toUid, isAnchor)
+                                    .setFullWindows(!isLiveRoom)
+                                    .setLiveRoom(isLiveRoom)
+                                    .setStar(isStar)
+                                    .showDialog();
+                        }
+                    } else {
+                        new GiftWallMainTab2ClassicInfoDialog(mContext, giftData, isAnchor).setFullWindows(!isLiveRoom).showDialog();
+                    }
+                } else {
+                    new GiftWallTab2List2Dialog(mContext).setGift(giftData).showDialog();
+                }
+            });
+        }
+
+        void display(Context context, String url, ImageView imageView, int width, int height) {
+            imageView.post(new Runnable() {
+                @Override
+                public void run() {
+                    RequestBuilder<Drawable> builder = Glide.with(context)
+                            .load(url);
+
+                    if (width != -1 && height != -1) {
+                        builder = builder.override(width, height);
+                    }
+                    builder
+                            .thumbnail(1.0f)
+                            .format(DecodeFormat.PREFER_RGB_565)
+                            .skipMemoryCache(true)
+                            .addListener(new RequestListener<Drawable>() {
+                                @Override
+                                public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
+                                    imageView.setImageDrawable(null);
+                                    return false;
+                                }
+
+                                @Override
+                                public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
+                                    return false;
+                                }
+                            })
+                            .diskCacheStrategy(DiskCacheStrategy.ALL)
+                            .into(imageView);
+                }
+            });
 
         }
     }
diff --git a/common/src/main/java/com/yunbao/common/adapter/GiftWallTab2GiftInfoListItemAdapter.java b/common/src/main/java/com/yunbao/common/adapter/GiftWallTab2GiftInfoListItemAdapter.java
index f7c083718..9923669b9 100644
--- a/common/src/main/java/com/yunbao/common/adapter/GiftWallTab2GiftInfoListItemAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/GiftWallTab2GiftInfoListItemAdapter.java
@@ -39,13 +39,12 @@ public class GiftWallTab2GiftInfoListItemAdapter extends RecyclerView.Adapter<Gi
 
     @Override
     public void onBindViewHolder(@NonNull VH holder, int position) {
-      //  holder.setData(data.get(position), position);
+        holder.setData(data.get(position), position);
     }
 
     @Override
     public int getItemCount() {
-       // return data.size();
-        return 20;
+        return data.size();
     }
 
     public class VH extends RecyclerView.ViewHolder {
diff --git a/common/src/main/java/com/yunbao/common/dialog/GiftWallMainTab2ClassicInfoDialog.java b/common/src/main/java/com/yunbao/common/dialog/GiftWallMainTab2ClassicInfoDialog.java
index 72f4a4373..b4c1eeada 100644
--- a/common/src/main/java/com/yunbao/common/dialog/GiftWallMainTab2ClassicInfoDialog.java
+++ b/common/src/main/java/com/yunbao/common/dialog/GiftWallMainTab2ClassicInfoDialog.java
@@ -173,17 +173,6 @@ public class GiftWallMainTab2ClassicInfoDialog extends AbsDialogPopupWindow {
     protected void onCreate() {
         super.onCreate();
         initView();
-        ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) mIvBack.getLayoutParams();
-        if (isFullWindows) {
-            params.width = DpUtil.dp2px(20);
-            mIvBack.setVisibility(View.VISIBLE);
-            mIvBg.setScaleType(ImageView.ScaleType.CENTER_CROP);
-        } else {
-            params.width = DpUtil.dp2px(1);
-            mIvBack.setVisibility(View.INVISIBLE);
-            mIvBg.setScaleType(ImageView.ScaleType.FIT_XY);
-        }
-        mIvBack.setLayoutParams(params);
 
     }
 }
diff --git a/common/src/main/java/com/yunbao/common/dialog/GiftWallTab2List2Dialog.java b/common/src/main/java/com/yunbao/common/dialog/GiftWallTab2List2Dialog.java
new file mode 100644
index 000000000..1c6772b89
--- /dev/null
+++ b/common/src/main/java/com/yunbao/common/dialog/GiftWallTab2List2Dialog.java
@@ -0,0 +1,65 @@
+package com.yunbao.common.dialog;
+
+import android.content.Context;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import com.lxj.xpopup.XPopup;
+import com.makeramen.roundedimageview.RoundedImageView;
+import com.yunbao.common.R;
+import com.yunbao.common.bean.GiftWallTab2Bean;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.utils.WordUtil;
+
+import java.util.Locale;
+
+public class GiftWallTab2List2Dialog extends AbsDialogCenterPopupWindow {
+    RoundedImageView user1Avatar, user2Avatar;
+    TextView user1Name, user2Name;
+    ImageView giftImage;
+    TextView giftName;
+    TextView titleValue;
+
+    GiftWallTab2Bean.Gift gift;
+
+    public GiftWallTab2List2Dialog(@NonNull Context context) {
+        super(context);
+    }
+
+    public GiftWallTab2List2Dialog setGift(GiftWallTab2Bean.Gift gift) {
+        this.gift = gift;
+        return this;
+    }
+
+    @Override
+    public void buildDialog(XPopup.Builder builder) {
+
+    }
+
+    @Override
+    public int bindLayoutId() {
+        return R.layout.dialog_gift_wall_tab2_list2;
+    }
+
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        user1Avatar = findViewById(R.id.user1_avatar);
+        user2Avatar = findViewById(R.id.user2_avatar);
+        user1Name = findViewById(R.id.user1_name);
+        user2Name = findViewById(R.id.user2_name);
+        giftImage = findViewById(R.id.gift);
+        titleValue = findViewById(R.id.title_value);
+        giftName = findViewById(R.id.gift_name);
+
+        ImgLoader.display(mContext, gift.getGiftIcon(), giftImage);
+        ImgLoader.display(mContext, gift.getNamingUserAvatar(), user1Avatar);
+        ImgLoader.display(mContext, gift.getNamingLiveAvatar(), user2Avatar);
+        user1Name.setText(gift.getNamingUserNicename());
+        user2Name.setText(gift.getNamingLiveNicename());
+        giftName.setText(WordUtil.isNewZh() ? gift.getGiftName() : gift.getGiftNameEn());
+        titleValue.setText(String.format(Locale.getDefault(), "%s", gift.getNeedCoinTotal()));
+    }
+}
diff --git a/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java b/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java
index dd88c2e1d..3eb235a0f 100644
--- a/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java
@@ -204,6 +204,8 @@ public class GiftWallMainTab2Fragment extends BaseFragment {
     }
 
     void initData() {
+        list1Adapter.clear();
+        list2Adapter.clear();
         LiveNetManager.get(getContext())
                 .allGiftHall(String.valueOf(type), new HttpCallback<GiftWallTab2Bean>() {
                     @Override
diff --git a/common/src/main/res/layout/dialog_gift_wall_tab2_list2.xml b/common/src/main/res/layout/dialog_gift_wall_tab2_list2.xml
new file mode 100644
index 000000000..5931cdb57
--- /dev/null
+++ b/common/src/main/res/layout/dialog_gift_wall_tab2_list2.xml
@@ -0,0 +1,123 @@
+<?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="match_parent">
+
+    <ImageView
+        android:id="@+id/imageView10"
+        android:layout_width="254dp"
+        android:layout_height="254dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@mipmap/dialog_gift_wall_tab2_list2_bg" />
+
+    <com.makeramen.roundedimageview.RoundedImageView
+        android:id="@+id/user1_avatar"
+        android:layout_width="58dp"
+        android:layout_height="58dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginStart="43dp"
+        android:scaleType="centerCrop"
+        android:src="@mipmap/icon_avatar_placeholder"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="@+id/imageView10"
+        app:layout_constraintStart_toStartOf="@+id/imageView10"
+        app:layout_constraintTop_toTopOf="@+id/imageView10"
+        app:riv_oval="true" />
+
+    <com.makeramen.roundedimageview.RoundedImageView
+        android:id="@+id/user2_avatar"
+        android:layout_width="58dp"
+        android:layout_height="58dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginEnd="37dp"
+        android:scaleType="centerCrop"
+        android:src="@mipmap/icon_avatar_placeholder"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="@+id/imageView10"
+        app:layout_constraintEnd_toEndOf="@+id/imageView10"
+        app:layout_constraintTop_toTopOf="@+id/imageView10"
+        app:riv_oval="true" />
+
+    <ImageView
+        android:id="@+id/imageView14"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="@+id/user1_avatar"
+        app:layout_constraintEnd_toStartOf="@+id/user2_avatar"
+        app:layout_constraintStart_toEndOf="@+id/user1_avatar"
+        app:layout_constraintTop_toTopOf="@+id/user1_avatar"
+        app:srcCompat="@mipmap/gift_wall_tab2_classic_info_star" />
+
+    <ImageView
+        android:id="@+id/gift"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        app:layout_constraintBottom_toTopOf="@+id/imageView10"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.515"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/imageView10"
+        app:srcCompat="@mipmap/img_honor_default" />
+
+    <TextView
+        android:id="@+id/gift_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextView"
+        android:textColor="#FFD3A4"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/gift" />
+
+    <TextView
+        android:id="@+id/user1_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        android:textColor="#FFD3A4"
+        android:text="TextView"
+        app:layout_constraintEnd_toEndOf="@+id/user1_avatar"
+        app:layout_constraintStart_toStartOf="@+id/user1_avatar"
+        app:layout_constraintTop_toBottomOf="@+id/user1_avatar" />
+
+    <TextView
+        android:id="@+id/user2_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        android:textColor="#FFD3A4"
+        android:text="TextView"
+        app:layout_constraintEnd_toEndOf="@+id/user2_avatar"
+        app:layout_constraintStart_toStartOf="@+id/user2_avatar"
+        app:layout_constraintTop_toBottomOf="@+id/user2_avatar" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#EEFFF8"
+        android:textSize="14sp"
+        android:layout_marginBottom="48dp"
+        android:text="@string/dialog_gift_wall_list_info_list_header_rename_value"
+        app:layout_constraintBottom_toBottomOf="@+id/imageView10"
+        app:layout_constraintEnd_toEndOf="@+id/imageView10"
+        app:layout_constraintStart_toStartOf="@+id/imageView10" />
+
+    <TextView
+        android:id="@+id/title_value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#EEFFF8"
+        android:textSize="12sp"
+        android:text="TextView"
+        app:layout_constraintEnd_toEndOf="@+id/title"
+        app:layout_constraintStart_toStartOf="@+id/title"
+        app:layout_constraintTop_toBottomOf="@+id/title" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/common/src/main/res/layout/fragment_gift_wall_man_tab_1.xml b/common/src/main/res/layout/fragment_gift_wall_man_tab_1.xml
index 59106a9e8..c14015e31 100644
--- a/common/src/main/res/layout/fragment_gift_wall_man_tab_1.xml
+++ b/common/src/main/res/layout/fragment_gift_wall_man_tab_1.xml
@@ -1,260 +1,266 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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="match_parent">
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#00000000">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"
+
+            app:toolbarId="@+id/toolbar">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/show_time_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <TextView
+                        android:id="@+id/show_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="#8AC3FF"
+                        android:textSize="12sp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:text="本期展館時間 :000000" />
+
+                    <ImageView
+                        android:id="@+id/imageView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="2dp"
+                        app:layout_constraintBottom_toBottomOf="@+id/show_time"
+                        app:layout_constraintStart_toEndOf="@+id/show_time"
+                        app:layout_constraintTop_toTopOf="@+id/show_time"
+                        app:srcCompat="@mipmap/ic_gift_wall_time" />
+
+                    <ImageView
+                        android:id="@+id/imageView2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="2dp"
+                        android:rotation="180"
+                        app:layout_constraintBottom_toBottomOf="@+id/show_time"
+                        app:layout_constraintEnd_toStartOf="@+id/show_time"
+                        app:layout_constraintTop_toTopOf="@+id/show_time"
+                        app:srcCompat="@mipmap/ic_gift_wall_time" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/star_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="275dp"
+                    android:layout_marginBottom="20dp">
+
+                    <ImageView
+                        android:id="@+id/bg1"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_marginEnd="8dp"
+                        android:background="@mipmap/gift_wall_main_list_bg"
+                        android:scaleType="fitXY"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:id="@+id/imageView41"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="-5dp"
+                        android:scaleType="fitXY"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:srcCompat="@mipmap/gift_wall_main_list_bottom" />
+
+                    <ImageView
+                        android:id="@+id/imageView51"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:scaleType="fitXY"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:srcCompat="@mipmap/gift_wall_main_list_top" />
+
+                    <TextView
+                        android:id="@+id/star_gifts_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="25dp"
+                        android:layout_marginTop="20dp"
+                        android:text="@string/dialog_gift_wall_list1_title"
+                        android:textColor="@color/white"
+                        android:textSize="15sp"
+                        android:textStyle="bold"
+                        app:layout_constraintStart_toStartOf="@+id/imageView41"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/star_gifts_number"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="5dp"
+                        android:text="TextView"
+                        android:textColor="#FEE5C0"
+                        android:textSize="10sp"
+                        app:layout_constraintBottom_toBottomOf="@+id/star_gifts_title"
+                        app:layout_constraintStart_toEndOf="@+id/star_gifts_title"
+                        app:layout_constraintTop_toTopOf="@+id/star_gifts_title" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/recyclerView1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="0dp"
+                        android:layout_marginStart="45dp"
+                        android:layout_marginTop="50dp"
+                        android:layout_marginEnd="45dp"
+                        android:layout_marginBottom="20dp"
+                        android:orientation="vertical"
+                        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:spanCount="3"
+                        tools:itemCount="6"
+                        tools:listitem="@layout/item_gift_wall_man_tab1_list_1" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </LinearLayout>
+
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/show_time_layout"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-        <TextView
-            android:id="@+id/show_time"
-            android:layout_width="wrap_content"
+        android:id="@+id/classic_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <ImageView
+            android:id="@+id/bg"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="2dp"
+            android:layout_marginEnd="5dp"
+            android:background="@mipmap/gift_wall_main_list_bg"
+            android:scaleType="fitXY"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/imageView4"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:textColor="#8AC3FF"
-            android:textSize="12sp"
+            android:scaleType="fitXY"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="本期展館時間 :000000" />
+            app:srcCompat="@mipmap/gift_wall_main_list_bottom" />
 
         <ImageView
-            android:id="@+id/imageView"
+            android:id="@+id/imageView5"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:srcCompat="@mipmap/gift_wall_main_list_top" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView2"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginStart="45dp"
+            android:layout_marginEnd="45dp"
+            android:layout_marginBottom="10dp"
+            android:orientation="vertical"
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            android:layout_marginTop="50dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:spanCount="4"
+            tools:itemCount="5"
+            tools:layoutManager="GridLayoutManager"
+            tools:listitem="@layout/item_gift_wall_man_tab1_list_2" />
+
+        <TextView
+            android:id="@+id/classic_gifts_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            app:layout_constraintBottom_toBottomOf="@+id/show_time"
-            app:layout_constraintStart_toEndOf="@+id/show_time"
-            app:layout_constraintTop_toTopOf="@+id/show_time"
-            app:srcCompat="@mipmap/ic_gift_wall_time" />
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="20dp"
+            android:text="@string/dialog_gift_wall_list2_title"
+            android:textColor="@color/white"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="@+id/imageView4"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
-            android:id="@+id/imageView2"
+        <TextView
+            android:id="@+id/classic_gifts_number"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="2dp"
-            android:rotation="180"
-            app:layout_constraintBottom_toBottomOf="@+id/show_time"
-            app:layout_constraintEnd_toStartOf="@+id/show_time"
-            app:layout_constraintTop_toTopOf="@+id/show_time"
-            app:srcCompat="@mipmap/ic_gift_wall_time" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="0dp"
-        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_toBottomOf="@+id/show_time_layout">
+            android:layout_marginStart="5dp"
+            android:text="TextView"
+            android:textColor="#A6A0E9FF"
+            android:textSize="10sp"
+            app:layout_constraintBottom_toBottomOf="@+id/classic_gifts_title"
+            app:layout_constraintStart_toEndOf="@+id/classic_gifts_title"
+            app:layout_constraintTop_toTopOf="@+id/classic_gifts_title" />
 
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:id="@+id/classic_gift_spinner"
+            android:layout_width="wrap_content"
+            android:layout_height="20dp"
+            android:layout_marginEnd="30dp"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="@+id/classic_gifts_title"
+            app:layout_constraintEnd_toEndOf="@+id/imageView4"
+            app:layout_constraintTop_toTopOf="@+id/classic_gifts_title">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/star_layout"
-                android:layout_width="match_parent"
-                android:layout_height="275dp"
-                android:layout_marginBottom="20dp">
+            <TextView
+                android:id="@+id/classic_gift_spinner_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/dialog_gift_wall_list_spinner_all"
+                android:textColor="#A0E9FF"
+                android:textSize="12sp" />
 
-                <ImageView
-                    android:id="@+id/bg1"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:scaleType="fitXY"
-                    android:layout_marginEnd="8dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    android:background="@mipmap/gift_wall_main_list_bg" />
-
-                <ImageView
-                    android:id="@+id/imageView41"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="-5dp"
-                    android:scaleType="fitXY"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@mipmap/gift_wall_main_list_bottom" />
-
-                <ImageView
-                    android:id="@+id/imageView51"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:scaleType="fitXY"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:srcCompat="@mipmap/gift_wall_main_list_top" />
-
-                <TextView
-                    android:id="@+id/star_gifts_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="25dp"
-                    android:layout_marginTop="20dp"
-                    android:text="@string/dialog_gift_wall_list1_title"
-                    android:textColor="@color/white"
-                    android:textSize="15sp"
-                    android:textStyle="bold"
-                    app:layout_constraintStart_toStartOf="@+id/imageView41"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/star_gifts_number"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="5dp"
-                    android:text="TextView"
-                    android:textColor="#FEE5C0"
-                    android:textSize="10sp"
-                    app:layout_constraintBottom_toBottomOf="@+id/star_gifts_title"
-                    app:layout_constraintStart_toEndOf="@+id/star_gifts_title"
-                    app:layout_constraintTop_toTopOf="@+id/star_gifts_title" />
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/recyclerView1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="0dp"
-                    android:layout_marginStart="45dp"
-                    android:layout_marginTop="50dp"
-                    android:layout_marginEnd="45dp"
-                    android:layout_marginBottom="20dp"
-                    android:orientation="vertical"
-                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:spanCount="3"
-                    tools:itemCount="6"
-                    tools:listitem="@layout/item_gift_wall_man_tab1_list_1" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/classic_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:minHeight="166dp">
-
-                <ImageView
-                    android:id="@+id/bg"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_marginStart="2dp"
-                    android:layout_marginEnd="5dp"
-                    android:background="@mipmap/gift_wall_main_list_bg"
-                    android:scaleType="fitXY"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <ImageView
-                    android:id="@+id/imageView4"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:scaleType="fitXY"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@mipmap/gift_wall_main_list_bottom" />
-
-                <ImageView
-                    android:id="@+id/imageView5"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:scaleType="fitXY"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:srcCompat="@mipmap/gift_wall_main_list_top" />
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/recyclerView2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="45dp"
-                    android:layout_marginTop="50dp"
-                    android:layout_marginEnd="45dp"
-                    android:layout_marginBottom="10dp"
-                    android:orientation="vertical"
-                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:spanCount="4"
-                    tools:itemCount="5"
-                    tools:layoutManager="GridLayoutManager"
-                    tools:listitem="@layout/item_gift_wall_man_tab1_list_2" />
-
-                <TextView
-                    android:id="@+id/classic_gifts_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="25dp"
-                    android:layout_marginTop="20dp"
-                    android:text="@string/dialog_gift_wall_list2_title"
-                    android:textColor="@color/white"
-                    android:textSize="15sp"
-                    android:textStyle="bold"
-                    app:layout_constraintStart_toStartOf="@+id/imageView4"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/classic_gifts_number"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="5dp"
-                    android:text="TextView"
-                    android:textColor="#A6A0E9FF"
-                    android:textSize="10sp"
-                    app:layout_constraintBottom_toBottomOf="@+id/classic_gifts_title"
-                    app:layout_constraintStart_toEndOf="@+id/classic_gifts_title"
-                    app:layout_constraintTop_toTopOf="@+id/classic_gifts_title" />
-
-                <LinearLayout
-                    android:id="@+id/classic_gift_spinner"
-                    android:layout_width="wrap_content"
-                    android:layout_height="20dp"
-                    android:layout_marginEnd="30dp"
-                    android:gravity="center"
-                    android:orientation="horizontal"
-                    app:layout_constraintBottom_toBottomOf="@+id/classic_gifts_title"
-                    app:layout_constraintEnd_toEndOf="@+id/imageView4"
-                    app:layout_constraintTop_toTopOf="@+id/classic_gifts_title">
-
-                    <TextView
-                        android:id="@+id/classic_gift_spinner_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:text="@string/dialog_gift_wall_list_spinner_all"
-                        android:textColor="#A0E9FF"
-                        android:textSize="12sp" />
-
-                    <ImageView
-                        android:id="@+id/classic_gift_spinner_ic"
-                        android:layout_width="13dp"
-                        android:layout_height="13dp"
-                        app:srcCompat="@mipmap/gift_wall_main_tab1_down_ic" />
-                </LinearLayout>
-            </androidx.constraintlayout.widget.ConstraintLayout>
+            <ImageView
+                android:id="@+id/classic_gift_spinner_ic"
+                android:layout_width="13dp"
+                android:layout_height="13dp"
+                app:srcCompat="@mipmap/gift_wall_main_tab1_down_ic" />
         </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/common/src/main/res/layout/fragment_gift_wall_man_tab_2.xml b/common/src/main/res/layout/fragment_gift_wall_man_tab_2.xml
index 2777ed51f..e1854d0d8 100644
--- a/common/src/main/res/layout/fragment_gift_wall_man_tab_2.xml
+++ b/common/src/main/res/layout/fragment_gift_wall_man_tab_2.xml
@@ -1,206 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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="match_parent">
 
-    <com.angcyo.tablayout.DslTabLayout
-        android:id="@+id/tab_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:tab_indicator_drawable="@drawable/gift_wall_man_tab2_dsl"
-        app:tab_indicator_height="2dp"
-        app:tab_indicator_y_offset="8dp"
-        app:tab_indicator_width="16dp"
-        app:tab_enable_text_bold="true"
-        app:tab_text_max_size="14sp"
-        app:tab_text_min_size="12sp">
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
+        android:background="#00000000"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-        <TextView
-            android:id="@+id/dsl_tab1"
-            android:layout_width="wrap_content"
-            android:layout_marginEnd="15dp"
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:letterSpacing="0.1"
-            android:text="@string/dialog_gift_wall_tab2_dsl_tab1"
-            android:textSize="12dp"
-            app:gradient_angle="45" />
+            app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"
+            app:toolbarId="@+id/toolbar">
 
-        <TextView
-            android:id="@+id/dsl_tab2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:letterSpacing="0.1"
-            android:text="@string/dialog_gift_wall_tab2_dsl_tab2"
-            android:textSize="12dp"
-            app:gradient_angle="45"
-            android:textColor="#FFEED8" />
-    </com.angcyo.tablayout.DslTabLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <com.angcyo.tablayout.DslTabLayout
+                        android:id="@+id/tab_layout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:tab_enable_text_bold="true"
+                        app:tab_indicator_drawable="@drawable/gift_wall_man_tab2_dsl"
+                        app:tab_indicator_height="2dp"
+                        app:tab_indicator_width="16dp"
+                        app:tab_indicator_y_offset="8dp"
+                        app:tab_text_max_size="14sp"
+                        app:tab_text_min_size="12sp">
+
+                        <TextView
+                            android:id="@+id/dsl_tab1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="15dp"
+                            android:letterSpacing="0.1"
+                            android:text="@string/dialog_gift_wall_tab2_dsl_tab1"
+                            android:textSize="12dp"
+                            app:gradient_angle="45" />
+
+                        <TextView
+                            android:id="@+id/dsl_tab2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:letterSpacing="0.1"
+                            android:text="@string/dialog_gift_wall_tab2_dsl_tab2"
+                            android:textColor="#FFEED8"
+                            android:textSize="12dp"
+                            app:gradient_angle="45" />
+                    </com.angcyo.tablayout.DslTabLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/show_time_layout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tab_layout">
+
+                        <TextView
+                            android:id="@+id/show_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="#E5D2C0"
+                            android:textSize="12sp"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            tools:text="本期展館時間 :000000" />
+
+                        <ImageView
+                            android:id="@+id/imageView"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="2dp"
+                            app:layout_constraintBottom_toBottomOf="@+id/show_time"
+                            app:layout_constraintStart_toEndOf="@+id/show_time"
+                            app:layout_constraintTop_toTopOf="@+id/show_time"
+                            app:srcCompat="@mipmap/ic_gift_wall_time2" />
+
+                        <ImageView
+                            android:id="@+id/imageView2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="2dp"
+                            android:rotation="180"
+                            app:layout_constraintBottom_toBottomOf="@+id/show_time"
+                            app:layout_constraintEnd_toStartOf="@+id/show_time"
+                            app:layout_constraintTop_toTopOf="@+id/show_time"
+                            app:srcCompat="@mipmap/ic_gift_wall_time2" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/star_layout"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <TextView
+                            android:id="@+id/star_gifts_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="25dp"
+                            android:layout_marginTop="20dp"
+                            android:text="@string/dialog_gift_wall_list1_title"
+                            android:textColor="@color/white"
+                            android:textSize="15sp"
+                            android:textStyle="bold"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/recyclerView1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_marginTop="50dp"
+                            android:orientation="vertical"
+                            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintHorizontal_bias="0.49"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintVertical_bias="1.0"
+                            app:spanCount="3"
+                            tools:itemCount="6"
+                            tools:listitem="@layout/item_gift_wall_man_tab2_list_1" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+                </LinearLayout>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/show_time_layout"
-        android:layout_width="wrap_content"
+        android:id="@+id/classic_layout"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tab_layout">
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <TextView
-            android:id="@+id/show_time"
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="#E5D2C0"
-            android:textSize="12sp"
+            android:layout_marginTop="50dp"
+            android:layout_marginBottom="20dp"
+            android:orientation="vertical"
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.492"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="本期展館時間 :000000" />
+            app:layout_constraintVertical_bias="0.0"
+            app:spanCount="3"
+            tools:itemCount="10"
+            tools:layoutManager="GridLayoutManager"
+            tools:listitem="@layout/item_gift_wall_man_tab2_list_2" />
 
-        <ImageView
-            android:id="@+id/imageView"
+        <TextView
+            android:id="@+id/classic_gifts_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            app:layout_constraintBottom_toBottomOf="@+id/show_time"
-            app:layout_constraintStart_toEndOf="@+id/show_time"
-            app:layout_constraintTop_toTopOf="@+id/show_time"
-            app:srcCompat="@mipmap/ic_gift_wall_time2" />
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="20dp"
+            android:text="@string/dialog_gift_wall_list2_title"
+            android:textColor="@color/white"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
-            android:id="@+id/imageView2"
+
+        <LinearLayout
+            android:id="@+id/classic_gift_spinner"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="2dp"
-            android:rotation="180"
-            app:layout_constraintBottom_toBottomOf="@+id/show_time"
-            app:layout_constraintEnd_toStartOf="@+id/show_time"
-            app:layout_constraintTop_toTopOf="@+id/show_time"
-            app:srcCompat="@mipmap/ic_gift_wall_time2" />
+            android:layout_height="20dp"
+            android:layout_marginEnd="30dp"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="@+id/classic_gifts_title"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/classic_gifts_title">
+
+            <TextView
+                android:id="@+id/classic_gift_spinner_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/dialog_gift_wall_list_spinner_all"
+                android:textColor="#A0E9FF"
+                android:textSize="12sp" />
+
+            <ImageView
+                android:id="@+id/classic_gift_spinner_ic"
+                android:layout_width="13dp"
+                android:layout_height="13dp"
+                app:srcCompat="@mipmap/gift_wall_main_tab1_down_ic" />
+        </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="0dp"
-        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_toBottomOf="@+id/show_time_layout">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/star_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="20dp">
-
-                <TextView
-                    android:id="@+id/star_gifts_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="25dp"
-                    android:layout_marginTop="20dp"
-                    android:text="@string/dialog_gift_wall_list1_title"
-                    android:textColor="@color/white"
-                    android:textSize="15sp"
-                    android:textStyle="bold"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/recyclerView1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="50dp"
-                    android:orientation="vertical"
-                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.49"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_bias="1.0"
-                    app:spanCount="3"
-                    tools:itemCount="6"
-                    tools:listitem="@layout/item_gift_wall_man_tab2_list_1" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/classic_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:minHeight="166dp">
-
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/recyclerView2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="50dp"
-                    android:layout_marginBottom="10dp"
-                    android:orientation="vertical"
-                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:spanCount="3"
-                    tools:itemCount="5"
-                    tools:layoutManager="GridLayoutManager"
-                    tools:listitem="@layout/item_gift_wall_man_tab2_list_2" />
-
-                <TextView
-                    android:id="@+id/classic_gifts_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="25dp"
-                    android:layout_marginTop="20dp"
-                    android:text="@string/dialog_gift_wall_list2_title"
-                    android:textColor="@color/white"
-                    android:textSize="15sp"
-                    android:textStyle="bold"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-
-                <LinearLayout
-                    android:id="@+id/classic_gift_spinner"
-                    android:layout_width="wrap_content"
-                    android:layout_height="20dp"
-                    android:layout_marginEnd="30dp"
-                    android:gravity="center"
-                    android:orientation="horizontal"
-                    app:layout_constraintBottom_toBottomOf="@+id/classic_gifts_title"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/classic_gifts_title">
-
-                    <TextView
-                        android:id="@+id/classic_gift_spinner_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:text="@string/dialog_gift_wall_list_spinner_all"
-                        android:textColor="#A0E9FF"
-                        android:textSize="12sp" />
-
-                    <ImageView
-                        android:id="@+id/classic_gift_spinner_ic"
-                        android:layout_width="13dp"
-                        android:layout_height="13dp"
-                        app:srcCompat="@mipmap/gift_wall_main_tab1_down_ic" />
-                </LinearLayout>
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/common/src/main/res/layout/item_dialog_gift_wall_tab2_gift_info.xml b/common/src/main/res/layout/item_dialog_gift_wall_tab2_gift_info.xml
index fbfcdfd4f..b195c3b2f 100644
--- a/common/src/main/res/layout/item_dialog_gift_wall_tab2_gift_info.xml
+++ b/common/src/main/res/layout/item_dialog_gift_wall_tab2_gift_info.xml
@@ -19,13 +19,13 @@
 
     <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"
-        >
+        android:layout_marginStart="36dp"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_rank"
+        app:layout_constraintStart_toEndOf="@+id/tv_rank"
+        app:layout_constraintTop_toTopOf="@+id/tv_rank">
+
         <ImageView
             android:id="@+id/user_avatar_tmp"
             android:layout_width="match_parent"
@@ -61,6 +61,9 @@
         android:layout_marginTop="10dp"
         android:textColor="#FFD3A4"
         android:textSize="13sp"
+        android:maxLength="5"
+        android:ellipsize="end"
+        android:maxLines="1"
         android:text="@string/dialog_gift_wall_list_info_list_header_rename"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/common/src/main/res/mipmap-xxhdpi/dialog_gift_wall_tab2_list2_bg.png b/common/src/main/res/mipmap-xxhdpi/dialog_gift_wall_tab2_list2_bg.png
new file mode 100644
index 000000000..ec9067fac
Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/dialog_gift_wall_tab2_list2_bg.png differ