女神说新的展示方式编辑完成

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

@@ -1,5 +1,7 @@
 package com.yunbao.common.bean;
 
+import androidx.annotation.Nullable;
+
 import com.google.gson.annotations.SerializedName;
 
 import java.util.List;
@@ -32,6 +34,9 @@ public class LiveAnchorSayModel extends BaseModel{
         private int isShow;
         private String content;
         private String styleImage;
+        @Nullable
+        private String title;
+
 
         public LivePreview() {
         }
@@ -48,6 +53,15 @@ public class LiveAnchorSayModel extends BaseModel{
             return content;
         }
 
+        @Nullable
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(@Nullable String title) {
+            this.title = title;
+        }
+
         public void setContent(String content) {
             this.content = content;
         }

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

@@ -246,7 +246,7 @@ public interface PDLiveApi {
      * 【新人特惠】【趣味游戏】【幸运天使】
      */
     @GET("/api/public/?service=Live.getLiveRoomActivtyBanner")
-    Observable<ResponseModel<List<LiveRoomActivityBanner>>> getLiveRoomActivityBanner();
+    Observable<ResponseModel<List<LiveRoomActivityBanner>>> getLiveRoomActivityBanner(@Query("langue") String language,@Query("version") String version);
 
     /**
      * 新侧边栏请求

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

@@ -1,6 +1,8 @@
 package com.yunbao.common.http.live;
 
 import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -348,8 +350,17 @@ public class LiveNetManager {
      * 获取 【新人特惠】【趣味游戏】【幸运天使】
      */
     public void getLiveRoomActivityBanner(HttpCallback<List<LiveRoomActivityBanner>> callback) {
+        //获取版本名称
+        String versionName = "";
+        try {
+            PackageManager manager = mContext.getPackageManager();
+            PackageInfo info = manager.getPackageInfo(mContext.getPackageName(), 0);
+            versionName = info.versionName;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         API.get().pdLiveApi(mContext)
-                .getLiveRoomActivityBanner()
+                .getLiveRoomActivityBanner( WordUtil.isNewZh()?"chinese":"english",versionName)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(listResponseModel -> {

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

@@ -243,7 +243,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
         });
         Log.i("LiveAudienceViewHolder", "init4");
 //        //底部礼物弹窗
-        ImgLoader.displayGif(mContext, R.mipmap.live_lw, giftImage);
+//        ImgLoader.displayGif(mContext, R.mipmap.live_lw, giftImage);
 
         ViewClicksAntiShake.clicksAntiShake(giftImage, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override

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

@@ -254,6 +254,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     private TextView mVotes;
     private TextView mTvMedalRank;
     private TextView mGuardNum;//守护人数
+
     private RecyclerView mUserRecyclerView;
     private RecyclerView mChatRecyclerView;
     private LiveUserAdapter mLiveUserAdapter;
@@ -290,6 +291,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     //    public static FrameLayout ft_hot_add;
     public static ImageView newMessage, atMessage;
 
+
     //多人PK
     static TextView time;
 
@@ -415,9 +417,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
 
     //----主播说组件---//
     private View mAnchorSay;
+    private TextView titleTv;
+    private TextView contentTv;
     private ImageView mAnchorSayImage;
-    private TextView mAnchorSayText;
+
-    private ImageView mAnchorSayHide;
     //----!主播说组件---//
     //----投票组件---//
     private LiveRoomVoteManager voteManager;
@@ -439,6 +442,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     private RecyclerView recycler_prank;
     private ImageView prank_group_bottom_icon, prank_group_turntable_icon;
     private GifImageView prank_small_icon;
+    private TextView zhengguTv;
     private PrankAdapter prankAdapter;
     private List<PrankProgressBean.PrankList> prankAndComboList = new ArrayList<>();
     private List<PrankProgressBean.PrankList> completedList = new ArrayList<>();
@@ -524,6 +528,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     private ProgressBar weekProgressbar;
     private Group newWeekGroup;
 
+    //
+    private Group  newGodSayGroup;
+    private View goddessSayBgView;
+    private TextView goddessSayTitleTv;
 
     public LiveRoomViewHolder setGuardType(int guardType) {
         this.guardType = guardType;
@@ -1651,23 +1659,34 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     public void init() {
         EventBus.getDefault().register(this);
         mAnchorSay = findViewById(R.id.anchor_say_layout);
-        mAnchorSayImage = (ImageView) findViewById(R.id.anchor_say_icon);
+        titleTv = findViewById(R.id.titleTv);
-        mAnchorSayText = (TextView) findViewById(R.id.anchor_say_text);
+        contentTv = findViewById(R.id.contentTv);
-        mAnchorSayHide = (ImageView) findViewById(R.id.anchor_say_hide);
+        mAnchorSayImage= findViewById(R.id.anchorSayImage);
-        mAnchorSayHide.setOnClickListener(new View.OnClickListener() {
+        goddessSayTitleTv = findViewById(R.id.goddessSayTitleTv);
-            @Override
+        newGodSayGroup =findViewById(R.id.newGodSayGroup);
-            public void onClick(View view) {
+        goddessSayBgView =findViewById(R.id.goddessSayBgView);
-                MobclickAgent.onEvent(mContext, "live_room_goddess_say", "女神说按钮");
-                hideAnchorSay();
-            }
-        });
         mAnchorSay.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 MobclickAgent.onEvent(mContext, "live_room_goddess_say", "女神说按钮");
-
+                hideAnchorSay();
+                newGodSayGroup.setVisibility(View.VISIBLE);
             }
         });
+        goddessSayBgView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mAnchorSay.setVisibility(View.VISIBLE);
+                newGodSayGroup.setVisibility(View.GONE);
+            }
+        });
+//        mAnchorSay.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                MobclickAgent.onEvent(mContext, "live_room_goddess_say", "女神说按钮");
+//
+//            }
+//        });
         svga_new_user_gif = (SVGAImageView) findViewById(R.id.svga_new_user_gif);
         svga_new_user_double = (SVGAImageView) findViewById(R.id.svga_new_user_double);
         svga_new_user_follow = (SVGAImageView) findViewById(R.id.svga_new_user_follow);
@@ -2282,7 +2301,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         prank_group_bottom_icon = (ImageView) findViewById(R.id.prank_group_bottom_icon);//收起icon
         prank_group_turntable_icon = (ImageView) findViewById(R.id.prank_group_turntable_icon);//转盘图标
         prank_small_icon = (GifImageView) findViewById(R.id.prank_small_icon);//收起后图标
-
+        zhengguTv = findViewById(R.id.zhengguTv);
         try {
             if (WordUtil.isNewZh()) {
                 mGifDrawable = new pl.droidsonroids.gif.GifDrawable(mContext.getResources(), R.drawable.pran_zh);
@@ -2327,7 +2346,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         //点击收起
         prank_group_bottom_icon.setOnClickListener(v -> {
             prank_group.setVisibility(View.INVISIBLE);
-            prank_small_icon.setVisibility(View.VISIBLE);
+            //prank_small_icon.setVisibility(View.VISIBLE);
+            zhengguTv.setVisibility(View.VISIBLE);
             if (CommonAppConfig.getInstance().getUid().equals(mLiveUid)) {
                 switchGifDrawable(!completedList.isEmpty());
             } else {
@@ -2335,10 +2355,15 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             }
         });
 
-        //点击收起整蛊icon
+//        //点击收起整蛊icon
-        prank_small_icon.setOnClickListener(v -> {
+//        prank_small_icon.setOnClickListener(v -> {
+//            prank_group.setVisibility(View.VISIBLE);
+//            prank_small_icon.setVisibility(View.GONE);
+//        });
+
+        zhengguTv.setOnClickListener(v -> {
             prank_group.setVisibility(View.VISIBLE);
-            prank_small_icon.setVisibility(View.GONE);
+            zhengguTv.setVisibility(View.GONE);
         });
 
         //点击图片转盘整蛊(跳转转盘整蛊)
@@ -2399,7 +2424,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     public void closePrankView() {
         if (prank_group.getVisibility() == View.VISIBLE) {
             prank_group.setVisibility(View.GONE);
-            prank_small_icon.setVisibility(View.VISIBLE);
+           // prank_small_icon.setVisibility(View.VISIBLE);
+            zhengguTv.setVisibility(View.VISIBLE);
         }
     }
 
@@ -2437,7 +2463,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             @Override
             public void onError(String error) {
                 prank_group.setVisibility(View.GONE);
-                prank_small_icon.setVisibility(View.GONE);
+               // prank_small_icon.setVisibility(View.GONE);
+                zhengguTv.setVisibility(View.GONE);
                 prank_group_turntable_icon.setVisibility(View.GONE);
                 ToastUtil.show(WordUtil.isNewZh() ? "抱歉！出錯了！" : "i \\'m sorry! An error occurred");
             }
@@ -2457,7 +2484,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 } else {
                     //编辑取消整蛊
                     prank_group.setVisibility(View.GONE);
-                    prank_small_icon.setVisibility(View.GONE);
+                    //prank_small_icon.setVisibility(View.GONE);
+                    zhengguTv.setVisibility(View.GONE);
                 }
                 if (CommonAppConfig.getInstance().getUid().equals(mLiveUid)) {
                     return;
@@ -2537,10 +2565,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         if (status == 1) {
             if (isShow == 1) {
                 prank_group.setVisibility(View.VISIBLE);
-                prank_small_icon.setVisibility(View.GONE);
+                //prank_small_icon.setVisibility(View.GONE);
+                zhengguTv.setVisibility(View.GONE);
             } else if (isShow == 2) {
                 prank_group.setVisibility(View.GONE);
-                prank_small_icon.setVisibility(View.VISIBLE);
+                //prank_small_icon.setVisibility(View.VISIBLE);
+                zhengguTv.setVisibility(View.VISIBLE);
             }
             //主播可能打开整蛊功能，但是不设置整蛊礼物，这里会是空列表
             if (!prankAndComboList.isEmpty()) {
@@ -2575,7 +2605,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 }
             } else {
                 prank_group.setVisibility(View.GONE);
-                prank_small_icon.setVisibility(View.GONE);
+               // prank_small_icon.setVisibility(View.GONE);
+                zhengguTv.setVisibility(View.GONE);
             }
             if (CommonAppConfig.getInstance().getUid().equals(mLiveUid)) {
 
@@ -2583,7 +2614,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                     @Override
                     public void onClick(View view) {
                         prank_group.setVisibility(View.GONE);
-                        prank_small_icon.setVisibility(View.VISIBLE);
+                        //prank_small_icon.setVisibility(View.VISIBLE);
+                        zhengguTv.setVisibility(View.VISIBLE);
                         switchGifDrawable(!completedList.isEmpty());
                     }
                 });
@@ -2607,7 +2639,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             }
         } else {
             prank_group.setVisibility(View.GONE);
-            prank_small_icon.setVisibility(View.GONE);
+           // prank_small_icon.setVisibility(View.GONE);
+            zhengguTv.setVisibility(View.GONE);
         }
     }
 
@@ -2901,42 +2934,44 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
      * 隐藏女神说
      */
     private void hideAnchorSay() {
-        boolean hide = mAnchorSay.getTag() == null || (boolean) mAnchorSay.getTag();
+        mAnchorSay.setVisibility(View.GONE);
-        Animation animation;
-        if (hide) {
-            animation = AnimationUtils.loadAnimation(mContext, R.anim.view_live_anchor_say_text_out);
-        } else {
-            animation = AnimationUtils.loadAnimation(mContext, R.anim.view_live_anchor_say_text_in);
-        }
-        animation.setAnimationListener(new Animation.AnimationListener() {
-            @Override
-            public void onAnimationStart(Animation animation) {
-                if (!hide) {
-                    mAnchorSay.setX((float) mAnchorSayImage.getTag());
-                    mAnchorSayImage.setVisibility(View.VISIBLE);
-                    mAnchorSayText.setVisibility(View.VISIBLE);
-                    mAnchorSayHide.setImageResource(R.mipmap.ic_live_anchor_say_show);
-                }
-            }
 
-            @Override
+//        boolean hide = mAnchorSay.getTag() == null || (boolean) mAnchorSay.getTag();
-            public void onAnimationEnd(Animation animation) {
+//        Animation animation;
-                if (hide) {
+//        if (hide) {
-                    mAnchorSayImage.setTag(mAnchorSay.getX());
+//            animation = AnimationUtils.loadAnimation(mContext, R.anim.view_live_anchor_say_text_out);
-                    mAnchorSay.setX(-DpUtil.dp2px(53));
+//        } else {
-                    mAnchorSayImage.setVisibility(View.INVISIBLE);
+//            animation = AnimationUtils.loadAnimation(mContext, R.anim.view_live_anchor_say_text_in);
-                    mAnchorSayText.setVisibility(View.INVISIBLE);
+//        }
-                    mAnchorSayHide.setImageResource(R.mipmap.ic_live_anchor_say_hide);
+//        animation.setAnimationListener(new Animation.AnimationListener() {
-                }
+//            @Override
-                mAnchorSay.setTag(!hide);
+//            public void onAnimationStart(Animation animation) {
-            }
+//                if (!hide) {
-
+//                    mAnchorSay.setX((float) mAnchorSayImage.getTag());
-            @Override
+//                   mAnchorSayImage.setVisibility(View.VISIBLE);
-            public void onAnimationRepeat(Animation animation) {
+//                    mAnchorSayText.setVisibility(View.VISIBLE);
-
+//                    mAnchorSayHide.setImageResource(R.mipmap.ic_live_anchor_say_show);
-            }
+//                }
-        });
+//            }
-        mAnchorSay.startAnimation(animation);
+//
+//            @Override
+//            public void onAnimationEnd(Animation animation) {
+//                if (hide) {
+//                    mAnchorSayImage.setTag(mAnchorSay.getX());
+//                    mAnchorSay.setX(-DpUtil.dp2px(53));
+//                    mAnchorSayImage.setVisibility(View.INVISIBLE);
+//                    mAnchorSayText.setVisibility(View.INVISIBLE);
+//                    mAnchorSayHide.setImageResource(R.mipmap.ic_live_anchor_say_hide);
+//                }
+//                mAnchorSay.setTag(!hide);
+//            }
+//
+//            @Override
+//            public void onAnimationRepeat(Animation animation) {
+//
+//            }
+//        });
+//        mAnchorSay.startAnimation(animation);
     }
 
     /**
@@ -6828,12 +6863,20 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 sayModel = data;
                 LiveAnchorSayModel.LivePreview preview = data.getLivePreview();
                 if (preview != null) {
-                    mAnchorSayText.setText(getText(data.getLivePreview().getContent()));
+                    String title=data.getLivePreview().getTitle();
-                    ImgLoader.display(mContext, preview.getStyleImage(), mAnchorSayImage);
+                    if (!TextUtils.isEmpty(title))
+                    {
+                        titleTv.setText(title);
+                        goddessSayTitleTv.setText(title);
+                    }
+                    contentTv.setText(data.getLivePreview().getContent());
+       //             ImgLoader.display(mContext, preview.getStyleImage(), mAnchorSayImage);
                     if (preview.getIsShow() == 1) {
                         mAnchorSay.setVisibility(View.VISIBLE);
+                        newGodSayGroup.setVisibility(View.GONE);
                     } else {
                         mAnchorSay.setVisibility(View.INVISIBLE);
+                        newGodSayGroup.setVisibility(View.GONE);
                     }
                 } else {
                     mAnchorSay.setVisibility(View.INVISIBLE);
@@ -6864,14 +6907,14 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     }
 
     public void initAnchorSay() {
-        if (mAnchorSay.getTag() != null) {
+//        if (mAnchorSay.getTag() != null) {
-            mAnchorSay.setX((float) mAnchorSayImage.getTag());
+//            mAnchorSay.setX((float) mAnchorSayImage.getTag());
-            mAnchorSayImage.setTag(null);
+//            mAnchorSayImage.setTag(null);
-            mAnchorSayImage.setVisibility(View.VISIBLE);
+//            mAnchorSayImage.setVisibility(View.VISIBLE);
-            mAnchorSayText.setVisibility(View.VISIBLE);
+//           mAnchorSayText.setVisibility(View.VISIBLE);
-            mAnchorSayHide.setImageResource(R.mipmap.ic_live_anchor_say_show);
+//           mAnchorSayHide.setImageResource(R.mipmap.ic_live_anchor_say_show);
-        }
+//        }
-        mAnchorSay.setTag(null);
+//        mAnchorSay.setTag(null);
         initAnchorSayData();
     }
 

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

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

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:radius="6dp" />
+    <solid android:color="#33333333" />
+</shape>

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

@@ -0,0 +1,54 @@
+<?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="96dp"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_live_room_say"
+    android:minHeight="90dp">
+
+    <TextView
+        android:id="@+id/titleTv"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="1"
+        android:paddingStart="15dp"
+        android:paddingEnd="15dp"
+        android:textColor="#ffffffff"
+        android:textSize="12sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="男神女神说" />
+
+    <TextView
+        android:id="@+id/contentTv"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
+        android:paddingBottom="6dp"
+        android:textColor="#ffffffff"
+        android:textSize="9sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/titleTv"
+        tools:text="欢迎大家来到我的直播间欢迎大家来到我的直播间欢迎大家来到我的直播休息13242" />
+
+
+    <ImageView
+        android:id="@+id/anchorSayImage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="5dp"
+        android:layout_marginBottom="5dp"
+        android:src="@mipmap/ic_live_say_unpand"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1773,14 +1773,13 @@
 
     <include
         android:id="@+id/anchor_say_layout"
-        layout="@layout/sim_live_room_anchor_say"
+        layout="@layout/sim_live_room_anchor_say1"
-        android:layout_width="67dp"
+        android:layout_width="96dp"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/live_video"
-        android:layout_marginStart="5dp"
+        android:layout_marginStart="12dp"
-        android:layout_marginBottom="-30dp"
+        android:visibility="invisible"
-        android:background="@color/white"
+        toolsvisible="visible"/>
-        android:visibility="invisible" />
 
     <ImageView
         android:id="@+id/icon_pk_top"
@@ -2543,222 +2542,6 @@
         android:layout_alignParentRight="true"
         android:layout_marginTop="190dp"
         android:layout_marginRight="10dp" />
-    <!--連麥-->
-<!--    <LinearLayout-->
-<!--        android:layout_width="50dp"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:layout_alignParentRight="true"-->
-<!--        android:layout_marginTop="190dp"-->
-<!--        android:layout_marginRight="10dp"-->
-<!--        android:gravity="bottom|center_horizontal"-->
-<!--        android:orientation="vertical">-->
-
-
-<!--        <RelativeLayout-->
-<!--            android:id="@+id/mic_view"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="65dp"-->
-<!--            android:layout_marginTop="10dp"-->
-<!--            android:background="@drawable/bg_live_video_chat"-->
-<!--            android:visibility="invisible"-->
-<!--            tools:visibility="visible">-->
-
-<!--            <com.makeramen.roundedimageview.RoundedImageView-->
-<!--                android:id="@+id/mic_ico"-->
-<!--                android:layout_width="30dp"-->
-<!--                android:layout_height="30dp"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                android:layout_marginStart="1dp"-->
-<!--                android:layout_marginTop="4dp"-->
-<!--                android:layout_marginEnd="1dp"-->
-<!--                android:layout_marginBottom="11dp"-->
-<!--                android:scaleType="centerCrop"-->
-<!--                android:src="@drawable/m_chu_xia"-->
-<!--                app:riv_oval="true" />-->
-
-<!--            <com.opensource.svgaplayer.SVGAImageView-->
-<!--                android:id="@+id/mic_gift_svga"-->
-<!--                android:layout_width="42dp"-->
-<!--                android:layout_height="38dp"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                app:autoPlay="true" />-->
-
-<!--            <ImageView-->
-<!--                android:id="@+id/userVoice"-->
-<!--                android:layout_width="10dp"-->
-<!--                android:layout_height="10dp"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                android:layout_marginTop="40dp"-->
-<!--                android:src="@mipmap/voice_open" />-->
-
-<!--            <LinearLayout-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_alignParentBottom="true"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                android:gravity="center">-->
-
-<!--                <TextView-->
-<!--                    android:layout_width="8dp"-->
-<!--                    android:layout_height="8dp"-->
-<!--                    android:background="@drawable/bg_live_room_mic_num"-->
-<!--                    android:gravity="center"-->
-<!--                    android:text="1"-->
-<!--                    android:textColor="@color/white"-->
-<!--                    android:textSize="6dp" />-->
-
-<!--                <TextView-->
-<!--                    android:id="@+id/userName"-->
-<!--                    android:layout_width="wrap_content"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:layout_marginStart="2dp"-->
-<!--                    android:ellipsize="end"-->
-<!--                    android:maxLines="1"-->
-<!--                    android:text="昵称"-->
-<!--                    android:textColor="@color/white"-->
-<!--                    android:textSize="10dp" />-->
-
-<!--            </LinearLayout>-->
-
-<!--        </RelativeLayout>-->
-
-<!--        <RelativeLayout-->
-<!--            android:id="@+id/mic_view1"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="65dp"-->
-<!--            android:layout_marginTop="10dp"-->
-<!--            android:background="@drawable/bg_live_video_chat"-->
-<!--            android:visibility="invisible"-->
-<!--            tools:visibility="visible">-->
-
-<!--            <com.makeramen.roundedimageview.RoundedImageView-->
-<!--                android:id="@+id/mic_ico1"-->
-<!--                android:layout_width="30dp"-->
-<!--                android:layout_height="30dp"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                android:layout_marginStart="1dp"-->
-<!--                android:layout_marginTop="4dp"-->
-<!--                android:layout_marginEnd="1dp"-->
-<!--                android:layout_marginBottom="11dp"-->
-<!--                android:scaleType="centerCrop"-->
-<!--                android:src="@drawable/m_chu_xia"-->
-<!--                app:riv_oval="true" />-->
-
-<!--            <com.opensource.svgaplayer.SVGAImageView-->
-<!--                android:id="@+id/mic_gift_svga1"-->
-<!--                android:layout_width="42dp"-->
-<!--                android:layout_height="38dp"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                app:autoPlay="true" />-->
-
-<!--            <ImageView-->
-<!--                android:id="@+id/userVoice1"-->
-<!--                android:layout_width="10dp"-->
-<!--                android:layout_height="10dp"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                android:layout_marginTop="40dp"-->
-<!--                android:src="@mipmap/voice_open" />-->
-
-<!--            <LinearLayout-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_alignParentBottom="true"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                android:gravity="center">-->
-
-<!--                <TextView-->
-<!--                    android:layout_width="8dp"-->
-<!--                    android:layout_height="8dp"-->
-<!--                    android:background="@drawable/bg_live_room_mic_num"-->
-<!--                    android:gravity="center"-->
-<!--                    android:text="2"-->
-<!--                    android:textColor="@color/white"-->
-<!--                    android:textSize="6dp" />-->
-
-<!--                <TextView-->
-<!--                    android:id="@+id/userName1"-->
-<!--                    android:layout_width="wrap_content"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:layout_marginStart="2dp"-->
-<!--                    android:ellipsize="end"-->
-<!--                    android:maxLines="1"-->
-<!--                    android:text="昵称"-->
-<!--                    android:textColor="@color/white"-->
-<!--                    android:textSize="10dp" />-->
-
-<!--            </LinearLayout>-->
-
-<!--        </RelativeLayout>-->
-
-<!--        <RelativeLayout-->
-<!--            android:id="@+id/mic_view2"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="65dp"-->
-<!--            android:layout_marginTop="10dp"-->
-<!--            android:background="@drawable/bg_live_video_chat"-->
-<!--            android:visibility="invisible"-->
-<!--            tools:visibility="visible">-->
-
-<!--            <com.makeramen.roundedimageview.RoundedImageView-->
-<!--                android:id="@+id/mic_ico2"-->
-<!--                android:layout_width="30dp"-->
-<!--                android:layout_height="30dp"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                android:layout_marginStart="1dp"-->
-<!--                android:layout_marginTop="4dp"-->
-<!--                android:layout_marginEnd="1dp"-->
-<!--                android:layout_marginBottom="11dp"-->
-<!--                android:scaleType="centerCrop"-->
-<!--                android:src="@drawable/m_chu_xia"-->
-<!--                app:riv_oval="true" />-->
-
-<!--            <com.opensource.svgaplayer.SVGAImageView-->
-<!--                android:id="@+id/mic_gift_svga2"-->
-<!--                android:layout_width="42dp"-->
-<!--                android:layout_height="38dp"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                app:autoPlay="true" />-->
-
-<!--            <ImageView-->
-<!--                android:id="@+id/userVoice2"-->
-<!--                android:layout_width="10dp"-->
-<!--                android:layout_height="10dp"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                android:layout_marginTop="40dp"-->
-<!--                android:src="@mipmap/voice_open" />-->
-
-<!--            <LinearLayout-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_alignParentBottom="true"-->
-<!--                android:layout_centerHorizontal="true"-->
-<!--                android:gravity="center">-->
-
-<!--                <TextView-->
-<!--                    android:layout_width="8dp"-->
-<!--                    android:layout_height="8dp"-->
-<!--                    android:background="@drawable/bg_live_room_mic_num"-->
-<!--                    android:gravity="center"-->
-<!--                    android:text="3"-->
-<!--                    android:textColor="@color/white"-->
-<!--                    android:textSize="6dp" />-->
-
-<!--                <TextView-->
-<!--                    android:id="@+id/userName2"-->
-<!--                    android:layout_width="wrap_content"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:layout_marginStart="2dp"-->
-<!--                    android:ellipsize="end"-->
-<!--                    android:maxLines="1"-->
-<!--                    android:text="昵称"-->
-<!--                    android:textColor="@color/white"-->
-<!--                    android:textSize="10dp" />-->
-
-<!--            </LinearLayout>-->
-
-<!--        </RelativeLayout>-->
-
-<!--    </LinearLayout>-->
 
     <com.yunbao.common.views.weight.FullServiceNotificationView
         android:id="@+id/full_screen"
@@ -2786,8 +2569,22 @@
             android:layout_height="33dp"
             android:layout_gravity="end"
             android:layout_marginBottom="5dp"
-            android:visibility="gone" />
+            android:visibility="gone"
-
+            tools:visibility="visible"/>
+        <TextView
+            android:id="@+id/zhengguTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/trick_up"
+            android:paddingTop="3dp"
+            android:paddingBottom="3dp"
+            android:paddingStart="8dp"
+            android:background="@drawable/bc_zheng_gu_left"
+            android:textColor="@color/white"
+            android:layout_gravity="end"
+            android:layout_marginBottom="5dp"
+            android:visibility="gone"
+            tools:visibility="visible"/>
         <ImageView
             android:id="@+id/prank_group_turntable_icon"
             android:layout_width="44dp"

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

@@ -128,7 +128,7 @@
         android:layout_height="match_parent"
         android:layout_marginEnd="10dp"
         android:background="@drawable/bg_live_item_rank"
-        app:layout_constraintDimensionRatio="2.6"
+        app:layout_constraintDimensionRatio="2.4"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -152,7 +152,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="7dp"
         android:layout_marginTop="1dp"
-        android:text="@string/live_room_gift"
+        android:text="@string/live_room_wishlist"
         android:textColor="#FFFFFF"
         android:textSize="9sp"
         app:layout_constraintStart_toStartOf="@+id/newWishBgView"
@@ -162,22 +162,22 @@
         android:id="@+id/newWishNowTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:text="5"
         android:textColor="#FFC949 "
         android:textSize="12sp"
         app:layout_constraintStart_toStartOf="@+id/newWishTitleTv"
-        app:layout_constraintTop_toBottomOf="@+id/newWishTitleTv" />
+        app:layout_constraintTop_toBottomOf="@+id/newWishTitleTv"
+        tools:text="5" />
 
     <TextView
         android:id="@+id/newWishTotalTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="bottom"
-        tools:text="/26"
         android:textColor="#FFFFFF"
         android:textSize="10sp"
         app:layout_constraintBottom_toBottomOf="@+id/newWishNowTv"
-        app:layout_constraintStart_toEndOf="@+id/newWishNowTv" />
+        app:layout_constraintStart_toEndOf="@+id/newWishNowTv"
+        tools:text="/26" />
 
     <ProgressBar
         android:id="@+id/wish_progressbar"
@@ -199,6 +199,7 @@
         app:constraint_referenced_ids="newWishBgView,newWishImg,newWishTitleTv,newWishNowTv,newWishTotalTv,wish_progressbar"
         tools:visibility="visible" />
 
+
     <!--周星榜-->
     <View
         android:id="@+id/newWeekBgView"
@@ -206,7 +207,7 @@
         android:layout_height="match_parent"
         android:layout_marginEnd="10dp"
         android:background="@drawable/bg_live_item_rank"
-        app:layout_constraintDimensionRatio="2.6"
+        app:layout_constraintDimensionRatio="2.4"
         app:layout_constraintEnd_toStartOf="@+id/newWishBgView"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -240,22 +241,22 @@
         android:id="@+id/newWeekNowTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:text="5"
         android:textColor="#FFC949 "
         android:textSize="12sp"
         app:layout_constraintStart_toStartOf="@+id/newWeekTitleTv"
-        app:layout_constraintTop_toBottomOf="@+id/newWeekTitleTv" />
+        app:layout_constraintTop_toBottomOf="@+id/newWeekTitleTv"
+        tools:text="5" />
 
     <TextView
         android:id="@+id/newWeekTotalTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="bottom"
-        tools:text="/26"
         android:textColor="#FFFFFF"
         android:textSize="10sp"
         app:layout_constraintBottom_toBottomOf="@+id/newWeekNowTv"
-        app:layout_constraintStart_toEndOf="@+id/newWeekNowTv" />
+        app:layout_constraintStart_toEndOf="@+id/newWeekNowTv"
+        tools:text="/26" />
 
     <ProgressBar
         android:id="@+id/week_progressbar"
@@ -277,5 +278,52 @@
         app:constraint_referenced_ids="newWeekBgView,newWeekImg,newWeekTitleTv,newWeekNowTv,newWeekTotalTv,week_progressbar"
         tools:visibility="visible" />
 
+    <View
+        android:id="@+id/goddessSayBgView"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_marginStart="10dp"
+        android:background="@drawable/bg_live_item_rank"
+        app:layout_constraintDimensionRatio="2.4"
+        app:layout_constraintStart_toEndOf="@+id/newDragonImg"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+    <ImageView
+        android:id="@+id/goddessSayImg"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:src="@mipmap/icon_arrow_right_3"
+        app:layout_constraintBottom_toBottomOf="@+id/goddessSayBgView"
+        app:layout_constraintDimensionRatio="1"
+        app:layout_constraintEnd_toEndOf="@+id/goddessSayBgView"
+        app:layout_constraintHeight_percent="0.5"
+        app:layout_constraintTop_toTopOf="@+id/goddessSayBgView" />
+
+    <TextView
+        android:id="@+id/goddessSayTitleTv"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="2"
+        android:paddingStart="5dp"
+        android:paddingEnd="1dp"
+        android:textColor="@color/white"
+        android:textSize="10sp"
+        app:layout_constraintBottom_toBottomOf="@+id/goddessSayBgView"
+        app:layout_constraintEnd_toStartOf="@+id/goddessSayImg"
+        app:layout_constraintStart_toStartOf="@+id/goddessSayBgView"
+        app:layout_constraintTop_toTopOf="@+id/goddessSayBgView"
+        tools:text="男神女神说标题" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/newGodSayGroup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:constraint_referenced_ids="goddessSayBgView,goddessSayTitleTv,goddessSayImg"
+        tools:visibility="visible" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -176,4 +176,5 @@
     <string name="live_room_push_new_person_task">Complete the newcomer tasks and receive multiple gifts</string>
     <string name="live_room_push_details">Details</string>
     <string name="live_room_push_like_an">If you like this anchor, please subscribe to him.</string>
+    <string name="trick_up">整蠱</string>
 </resources>