update 礼物墙

common/src/main/java/com/yunbao/common/activity/WebViewActivity.java

@@ -88,9 +88,9 @@ public class WebViewActivity extends AbsActivity {
 
     @Override
     public void setStatusBar() {
-        getWindow().setStatusBarColor(Color.parseColor("#FFFFFF"));
+//        getWindow().setStatusBarColor(Color.parseColor("#FFFFFF"));
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+//        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+//        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
     }
 
     @Override

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

@@ -13,6 +13,7 @@ import com.makeramen.roundedimageview.RoundedImageView;
 import com.yunbao.common.R;
 import com.yunbao.common.bean.GiftWallInfoBean;
 import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.WordUtil;
 
 import java.util.ArrayList;
@@ -21,11 +22,51 @@ import java.util.Locale;
 
 public class GiftWallGiftInfoListItemAdapter extends RecyclerView.Adapter<GiftWallGiftInfoListItemAdapter.VH> {
     List<GiftWallInfoBean.Data> data = new ArrayList<>();
+    boolean isAnchor;
+    int list_type = 1;
+    private boolean isLiveRoom;
+    private boolean isStar;
+    int giftStatus;
+    private String anchorName;
+    private String anchorAvatar;
+
+    public void setAnchorName(String anchorName) {
+        this.anchorName = anchorName;
+    }
+
+    public void setAnchorAvatar(String anchorAvatar) {
+        this.anchorAvatar = anchorAvatar;
+    }
+
+    public void setGiftStatus(int giftStatus) {
+        this.giftStatus = giftStatus;
+    }
+
+    public void setAnchor(boolean anchor) {
+        isAnchor = anchor;
+    }
+
+    public void setList_type(int list_type) {
+        this.list_type = list_type;
+    }
+
+    public void setLiveRoom(boolean liveRoom) {
+        isLiveRoom = liveRoom;
+    }
+
+    public void setStar(boolean star) {
+        isStar = star;
+    }
 
     public void setData(List<GiftWallInfoBean.Data> data) {
         if (data == null) {
             data = new ArrayList<>();
         }
+        if (data.isEmpty()) {
+            GiftWallInfoBean.Data tmp = new GiftWallInfoBean.Data();
+            tmp.setId(-1);
+            data.add(tmp);
+        }
         this.data = data;
         notifyDataSetChanged();
     }
@@ -47,8 +88,8 @@ public class GiftWallGiftInfoListItemAdapter extends RecyclerView.Adapter<GiftWa
     }
 
     public class VH extends RecyclerView.ViewHolder {
-        TextView tv_rank, user_name, tv_rename;
+        TextView tv_rank, user_name, tv_rename, anchor_name;
-        RoundedImageView avatar;
+        RoundedImageView avatar, avatar2;
 
         public VH(@NonNull View itemView) {
             super(itemView);
@@ -56,21 +97,54 @@ public class GiftWallGiftInfoListItemAdapter extends RecyclerView.Adapter<GiftWa
             user_name = itemView.findViewById(R.id.user_name);
             tv_rename = itemView.findViewById(R.id.tv_rename);
             avatar = itemView.findViewById(R.id.avatar);
+            avatar2 = itemView.findViewById(R.id.avatar2);
+            anchor_name = itemView.findViewById(R.id.anchor_name);
         }
 
         public void setData(GiftWallInfoBean.Data data, int position) {
+            if (data.getId() == -1) {
+                tv_rank.setText("");
+                tv_rename.setText("");
+                user_name.setTextColor(Color.parseColor("#A2A2A2"));
+                avatar.setVisibility(View.GONE);
+                if (giftStatus != 1) {
+                    user_name.setText(WordUtil.getNewString(R.string.dialog_gift_wall_tab2_list_wait));
+                } else if (!isStar) {
+                    user_name.setText(WordUtil.getNewString(R.string.dialog_gift_wall_classic_wait));
+                } else {
+                    user_name.setText(WordUtil.getNewString(R.string.dialog_gift_wall_assistance_wait));
+                }
+                return;
+            }
+            if (isStar && list_type == 2) {
+                ImgLoader.display(itemView.getContext(), data.getLive_avatar(), avatar);
+                anchor_name.setText(data.getLive_user_name());
+                if (data.getActive_rank_hide() == 1) {
+                    avatar2.setImageResource(R.mipmap.hide);
+                    user_name.setText(WordUtil.getNewString(R.string.mystery_man));
+                } else {
+                    ImgLoader.display(itemView.getContext(), data.getAvatar(), avatar2);
+                    user_name.setText(data.getUser_name());
+                }
+                anchor_name.setVisibility(View.VISIBLE);
+                avatar2.setVisibility(View.VISIBLE);
+            } else {
+                avatar2.setVisibility(View.INVISIBLE);
+                anchor_name.setVisibility(View.GONE);
+                if (data.getActive_rank_hide() == 1) {
+                    avatar.setImageResource(R.mipmap.hide);
+                    user_name.setText(WordUtil.getNewString(R.string.mystery_man));
+                } else {
+                    ImgLoader.display(itemView.getContext(), data.getAvatar(), avatar);
+                    user_name.setText(data.getUser_name());
+                }
+            }
+            user_name.setTextColor(Color.parseColor("#FFFFFF"));
             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.getGift_hall_send_num())));
+            tv_rename.setText(String.format(Locale.getDefault(), "%s", (data.getGift_hall_send_numForString())));
             avatar.setVisibility(View.VISIBLE);
-            if (data.getActive_rank_hide() == 1) {
-                user_name.setText(WordUtil.getNewString(R.string.mystery_man));
-                avatar.setImageResource(R.mipmap.hide);
-            } else {
-                user_name.setText(data.getUser_name());
-                ImgLoader.display(itemView.getContext(), data.getAvatar(), avatar);
-            }
         }
 
     }

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

@@ -204,13 +204,47 @@ public class GiftWallInfoBean extends BaseModel {
         private int id;
         private int active_rank_hide;
         private String create_time;
+        private String live_id;
+        private String live_user_name;
+        private String live_avatar;
+
 
         // 同样地，这里省略getter和setter方法
 
+        public String getLive_id() {
+            return live_id;
+        }
+
+        public void setLive_id(String live_id) {
+            this.live_id = live_id;
+        }
+
+        public String getLive_user_name() {
+            return live_user_name;
+        }
+
+        public void setLive_user_name(String live_user_name) {
+            this.live_user_name = live_user_name;
+        }
+
+        public String getLive_avatar() {
+            return live_avatar;
+        }
+
+        public void setLive_avatar(String live_avatar) {
+            this.live_avatar = live_avatar;
+        }
+
         public int getGift_hall_send_num() {
             return gift_hall_send_num;
         }
-
+        public String getGift_hall_send_numForString() {
+            if(gift_hall_send_num>999999){
+                return "999999+";
+            }else{
+                return String.valueOf(gift_hall_send_num);
+            }
+        }
         public void setGift_hall_send_num(int gift_hall_send_num) {
             this.gift_hall_send_num = gift_hall_send_num;
         }

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

@@ -18,9 +18,11 @@ import androidx.viewpager2.widget.ViewPager2;
 
 import com.lxj.xpopup.XPopup;
 import com.yunbao.common.R;
+import com.yunbao.common.bean.GiftWallBean;
 import com.yunbao.common.fragment.BaseFragment;
 import com.yunbao.common.fragment.GiftWallMainTab1Fragment;
 import com.yunbao.common.fragment.GiftWallMainTab2Fragment;
+import com.yunbao.common.interfaces.OnItemClickListener;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.ScreenDimenUtil;
 import com.yunbao.common.utils.WordUtil;
@@ -98,7 +100,16 @@ public class GiftWallDialog extends AbsDialogPopupWindow {
                 WordUtil.isNewZh() ? "的禮物展館" : "'s Gift Hall"
         ));
 
-        fragments.add(new GiftWallMainTab1Fragment().setToUserId(toUserId).setAnchor(isAnchor).setLiveRoom(!isFullWindows));
+        fragments.add(new GiftWallMainTab1Fragment().setToUserId(toUserId).setAnchor(isAnchor).setLiveRoom(!isFullWindows).setOnItemClickListener(new OnItemClickListener<GiftWallBean>() {
+            @Override
+            public void onItemClick(GiftWallBean bean, int position) {
+                if (position == 1) {
+                    mAchievement.setVisibility(View.INVISIBLE);
+                } else {
+                    mAchievement.setVisibility(View.VISIBLE);
+                }
+            }
+        }));
         fragments.add(new GiftWallMainTab2Fragment().setToUserId(toUserId).setAnchor(isAnchor).setLiveRoom(!isFullWindows));
         mViewPager.setAdapter(new FragmentStateAdapter((FragmentActivity) mContext) {
             @NonNull
@@ -118,9 +129,9 @@ public class GiftWallDialog extends AbsDialogPopupWindow {
             public void onPageSelected(int position) {
                 super.onPageSelected(position);
                 fragments.get(position).updateData();
-                if(position==0){
+                if (position == 0) {
                     mTvUserName.setTextColor(Color.parseColor("#6BCDFF"));
-                }else{
+                } else {
                     mTvUserName.setTextColor(Color.parseColor("#FFCF94"));
                 }
             }
@@ -179,6 +190,6 @@ public class GiftWallDialog extends AbsDialogPopupWindow {
             mIvBg.setScaleType(ImageView.ScaleType.FIT_XY);
         }
         mIvBack.setLayoutParams(params);
-
+        ViewClicksAntiShake.clicksAntiShake(mIvBack, this::dismiss);
     }
 }

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

@@ -12,6 +12,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.lxj.xpopup.XPopup;
@@ -32,6 +33,7 @@ import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.interfaces.OnItemClickListener;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.ScreenDimenUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -61,6 +63,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
     Button btn_lighten;
     View tab_layout;
     View bottom_layout;
+    View gift_schedule;
 
     GiftWallGiftInfoListItemAdapter adapter;
     RecyclerView recyclerView;
@@ -148,7 +151,11 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
         recyclerView = findViewById(R.id.recyclerView);
         tab_layout = findViewById(R.id.tab_layout);
         bottom_layout = findViewById(R.id.bottom_layout);
+        gift_schedule = findViewById(R.id.gift_schedule);
         adapter = new GiftWallGiftInfoListItemAdapter();
+        adapter.setAnchor(isAnchor);
+        adapter.setLiveRoom(isLiveRoom);
+        adapter.setStar(isStar);
         recyclerView.setAdapter(adapter);
         recyclerView.addItemDecoration(new ItemDecoration(mContext, 0x00000000, 0, 10));
 
@@ -220,10 +227,27 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
                 Bus.get().post(new ClosePopupDialogEvent());
             }
         });
+
+        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);
+        ViewClicksAntiShake.clicksAntiShake(mIvBack, this::dismiss);
     }
 
     void initData() {
+        adapter.setList_type(list_type);
         if (isAnchor) {
+            if(isStar){
+                gift_hall_type=2;
+            }
             LiveNetManager.get(mContext)
                     .liveGiftHallDetail(toUserId, giftId, gift_hall_type, list_type, new HttpCallback<GiftWallInfoBean>() {
                         @Override
@@ -271,6 +295,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
             btn_lighten.setText(WordUtil.getNewString(R.string.dialog_gift_wall_list_spinner_down));
             btn_lighten.setBackgroundResource(R.drawable.gift_wall_gift_info_un_lighten);
         }
+        adapter.setGiftStatus(giftBean.getGift_info().getIlluminate_status());
         if (isAnchor) {
             tab_layout.setVisibility(View.VISIBLE);
             bottom_layout.setVisibility(View.VISIBLE);
@@ -279,10 +304,15 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
             tab_layout.setVisibility(View.GONE);
             bottom_layout.setVisibility(View.GONE);
             tv_list_title.setVisibility(View.VISIBLE);
+            if (!toUserId.equals(IMLoginManager.get(mContext).getUserInfo().getId() + "")) {
                 gift_btn.setVisibility(View.GONE);
+                gift_schedule.setVisibility(View.GONE);
+                gift_progress.setVisibility(View.GONE);
+            }
         }
         if (!isLiveRoom) {
             gift_btn.setEnabled(false);
+            gift_btn.setBackgroundResource(R.drawable.gift_wall_gift_info_btn_un);
         }
         adapter.setData(giftBean.getData());
         time = (WordUtil.isNewZh() ? "榜單結算時間" : "Settlement time") + giftBean.getGift_info().getGift_hall_start() + " - " + giftBean.getGift_info().getGift_hall_end();

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

@@ -49,6 +49,10 @@ public class GiftWallMainTab1Fragment extends BaseFragment {
     View classic_layout, star_layout;
     TextView show_time;
     View show_time_layout;
+    View hideLayout;
+    View appbar;
+
+    OnItemClickListener<GiftWallBean> onItemClickListener;
 
     @Override
     public View createView(LayoutInflater inflater, ViewGroup container) {
@@ -75,6 +79,11 @@ public class GiftWallMainTab1Fragment extends BaseFragment {
         return this;
     }
 
+    public GiftWallMainTab1Fragment setOnItemClickListener(OnItemClickListener<GiftWallBean> onItemClickListener) {
+        this.onItemClickListener = onItemClickListener;
+        return this;
+    }
+
     @Override
     public void updateData() {
         super.updateData();
@@ -114,6 +123,17 @@ public class GiftWallMainTab1Fragment extends BaseFragment {
     }
 
     private void initData(GiftWallBean bean) {
+        onItemClickListener.onItemClick(bean, bean.getActive_rank_hide());
+        if (bean.getActive_rank_hide() == 1 && !toUserId.equals(IMLoginManager.get(getContext()).getUserInfo().getId() + "")) {
+            hideLayout.setVisibility(View.VISIBLE);
+            appbar.setVisibility(View.GONE);
+            classic_layout.setVisibility(View.GONE);
+            return;
+        }
+        hideLayout.setVisibility(View.GONE);
+        appbar.setVisibility(View.VISIBLE);
+        classic_layout.setVisibility(View.VISIBLE);
+
         list1Adapter.setDrawable(drawable);
         list1Adapter.setList(bean.getIlluminate_data().getWeek_star_data());
         list2Adapter.setList(bean.getIlluminate_data().getGift_data());
@@ -152,6 +172,8 @@ public class GiftWallMainTab1Fragment extends BaseFragment {
         star_layout = contentView.findViewById(R.id.star_layout);
         show_time = contentView.findViewById(R.id.show_time);
         show_time_layout = contentView.findViewById(R.id.show_time_layout);
+        hideLayout = contentView.findViewById(R.id.hideLayout);
+        appbar = contentView.findViewById(R.id.appbar);
 
         list1Adapter = new GiftWallMainTab1List2Adapter(getContext());
         list2Adapter = new GiftWallMainTab1List2Adapter(getContext());

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="8dp"/>
+            <gradient
+                android:startColor="#A6A6B3"
+                android:endColor="#A6A6B3"
+                android:angle="0"
+                />
+        </shape>
+    </item>
+</selector>

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

@@ -24,6 +24,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="10dp"
+        android:visibility="invisible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 

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

@@ -19,9 +19,9 @@
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         android:fillViewport="true"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_layout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -61,11 +61,18 @@
                     app:layout_constraintTop_toTopOf="parent"
                     tools:src="@mipmap/gift_wall_gift_info_light" />
 
-                <TextView
+
+                <com.yunbao.common.views.weight.MarqueeTextView
                     android:id="@+id/gift_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="17dp"
+                    android:ellipsize="marquee"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:marqueeRepeatLimit="marquee_forever"
+                    android:maxLength="3"
+                    android:scrollHorizontally="true"
                     android:singleLine="true"
                     android:textColor="#FFFFFF"
                     android:textSize="20sp"
@@ -130,6 +137,7 @@
                     </LinearLayout>
 
                     <LinearLayout
+                        android:id="@+id/gift_schedule"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_marginTop="5dp"
@@ -268,9 +276,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="20dp"
-                    android:layout_marginTop="-25dp"
                     android:layout_marginEnd="20dp"
-                    android:layout_marginBottom="20dp"
                     android:orientation="vertical"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -337,12 +343,12 @@
             tools:text="00" />
 
         <TextView
-            android:gravity="center"
             android:id="@+id/btn_one"
             android:layout_width="0dp"
             android:layout_height="26dp"
             android:layout_marginEnd="17dp"
             android:background="@drawable/gift_wall_gift_info_btn"
+            android:gravity="center"
             android:minWidth="65dp"
             android:textAllCaps="false"
             android:textColor="#02215D"
@@ -355,14 +361,14 @@
         <Button
             android:id="@+id/btn_one_tips"
             android:layout_width="wrap_content"
-            android:elevation="10dp"
-            android:translationZ="2dp"
             android:layout_height="11dp"
             android:layout_marginBottom="-5dp"
             android:background="@drawable/gift_wall_gift_info_bottom_btn_tips"
+            android:elevation="10dp"
             android:minWidth="32dp"
             android:text="需10个"
             android:textSize="8dp"
+            android:translationZ="2dp"
             app:layout_constraintBottom_toTopOf="@+id/btn_one"
             app:layout_constraintEnd_toEndOf="@+id/btn_one" />
     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -263,4 +263,33 @@
                 app:srcCompat="@mipmap/gift_wall_main_tab1_down_ic" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/hideLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+
+        <ImageView
+            android:id="@+id/imageView15"
+            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_hide" />
+
+        <TextView
+            android:id="@+id/textView3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/dialog_gift_wall_hide"
+            android:textColor="#FFFFFF"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="@+id/imageView15"
+            app:layout_constraintStart_toStartOf="@+id/imageView15"
+            app:layout_constraintTop_toBottomOf="@+id/imageView15" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -9,14 +9,27 @@
         android:id="@+id/tv_rank"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
         android:gravity="start"
         android:text="@string/dialog_gift_wall_list_info_list_header_rank"
         android:textColor="#FFFFFF"
         android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-
+    <com.makeramen.roundedimageview.RoundedImageView
+        android:id="@+id/avatar2"
+        android:layout_width="37dp"
+        android:layout_height="37dp"
+        android:layout_alignParentBottom="true"
+        android:scaleType="centerCrop"
+        android:layout_marginStart="32dp"
+        android:src="@mipmap/icon_avatar_placeholder"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_rank"
+        app:layout_constraintStart_toEndOf="@+id/tv_rank"
+        app:layout_constraintTop_toTopOf="@+id/tv_rank"
+        app:riv_oval="true"
+        tools:visibility="visible" />
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/avatar"
         android:layout_width="37dp"
@@ -32,27 +45,54 @@
         app:riv_oval="true"
         tools:visibility="visible" />
 
-    <TextView
+    <LinearLayout
-        android:id="@+id/user_name"
+        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_width="wrap_content"
+        app:layout_constraintEnd_toStartOf="@+id/tv_rename"
+        app:layout_constraintStart_toEndOf="@+id/avatar2"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
+        android:layout_marginEnd="70dp"
+        android:layout_marginBottom="10dp"
+        android:orientation="vertical"
+        >
+        <TextView
+            android:id="@+id/anchor_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/dialog_gift_wall_list_info_list_header_rename"
             android:textColor="#FFFFFF"
             android:textSize="12sp"
+            android:ellipsize="end"
+            android:visibility="gone"
+            android:singleLine="true"
+            />
+        <TextView
+            android:id="@+id/user_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
             android:text="@string/dialog_gift_wall_list_info_list_header_rename"
-        app:layout_constraintEnd_toEndOf="parent"
+            android:textColor="#FFFFFF"
-        app:layout_constraintStart_toStartOf="parent"
+            android:textSize="12sp"
-        app:layout_constraintTop_toTopOf="parent" />
+            android:ellipsize="end"
+            android:singleLine="true"
+            />
+
+    </LinearLayout>
 
     <TextView
         android:id="@+id/tv_rename"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:gravity="end"
+        android:text="@string/dialog_gift_wall_list_info_list_header_rename_value"
         android:textColor="#FFFFFF"
         android:textSize="12sp"
-        android:gravity="end"
+        app:layout_constraintBottom_toBottomOf="parent"
-        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" />
 

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

@@ -1528,5 +1528,7 @@
     <string name="dialog_gift_wall_tab2_list_wait">等待點亮</string>
     <string name="dialog_gift_wall_tab2_dsl_tab1">本期角逐</string>
     <string name="dialog_gift_wall_tab2_dsl_tab2">上期冠名</string>
-
+    <string name="dialog_gift_wall_hide">已隐藏</string>
+    <string name="dialog_gift_wall_classic_wait">等待冠名</string>
+    <string name="dialog_gift_wall_assistance_wait">等待助力</string>
 </resources>

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

@@ -1533,7 +1533,10 @@
     <string name="dialog_gift_wall_list_info_list_header_rename_value1">Star value</string>
     <string name="dialog_gift_wall_list1_title">Star Gifts</string>
     <string name="dialog_gift_wall_list2_title">Classic Gifts</string>
-    <string name="dialog_gift_wall_tab2_list_wait">Waiting for titling</string>
+    <string name="dialog_gift_wall_tab2_list_wait">Waiting for lighting</string>
     <string name="dialog_gift_wall_tab2_dsl_tab1">This competition</string>
     <string name="dialog_gift_wall_tab2_dsl_tab2">Previous Title</string>
+    <string name="dialog_gift_wall_hide">Hidden</string>
+    <string name="dialog_gift_wall_classic_wait">Waiting for titling</string>
+    <string name="dialog_gift_wall_assistance_wait">Waiting for assistance</string>
 </resources>

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

@@ -3698,8 +3698,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.LIVE_WKS));
             }
         });
-        //wksAndGiftWall.addView(weekView);
+       // wksAndGiftWall.addView(weekView);
-        //wksAndGiftWall.startFlipping();
+       // wksAndGiftWall.startFlipping();
         new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveWksLayout, "rectangle_new.png", 1);
     }
 

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

@@ -79,9 +79,9 @@ public class ZhuangBanActivity extends AbsActivity {
 
     @Override
     public void setStatusBar() {
-        getWindow().setStatusBarColor(Color.parseColor("#FFFFFF"));
+//        getWindow().setStatusBarColor(Color.parseColor("#FFFFFF"));
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+//        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+//        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
     }
     @Override
     protected int getLayoutId() {