周星榜数量修改

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

@@ -116,6 +116,33 @@ public class EnterRoomInfoModel extends BaseModel {
     @SerializedName("connection_info")
     private LivePkMicModel connectionInfo;
 
+    @SerializedName("week_star_gift_num")
+    private String weekStarGiftNum;
+
+    @SerializedName("week_gift_illuminate_num")
+    private String weekGiftIlluminateNum;
+
+    // 对应的getter和setter方法
+    public String getWeekStarGiftNum() {
+        return weekStarGiftNum;
+    }
+
+    public void setWeekStarGiftNum(String weekStarGiftNum) {
+        this.weekStarGiftNum = weekStarGiftNum;
+    }
+
+    public String getWeekGiftIlluminateNum() {
+        return weekGiftIlluminateNum;
+    }
+
+    public void setWeekGiftIlluminateNum(String weekGiftIlluminateNum) {
+        this.weekGiftIlluminateNum = weekGiftIlluminateNum;
+    }
+//
+//     "week_star_gift_num": 0,
+//     "week_gift_illuminate_num": 0
+
+
     @SerializedName("is_first_entry")
     private String isFirstEntry;
     @SerializedName("is_new_user")

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

@@ -2800,7 +2800,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     }
 
     //是否是主播
-    private boolean isAnchorLive() {
+    public boolean isAnchorLive() {
         return mContext instanceof LiveRyAnchorActivity || mContext instanceof LiveSwAnchorActivity;
     }
 

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

@@ -864,7 +864,12 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                             //红包相关
                             mLiveRoomViewHolder.setRedPackBtnVisible(Integer.parseInt(data.getEnterRoomInfo().getIsred()) == 1);
                             //礼物墙相关
-                            mLiveRoomViewHolder.setGiftWall(data.getEnterRoomInfo().getGiftWallLightenNumber(), data.getEnterRoomInfo().getGiftWallLightenTotal());
+                            if(mLiveRoomViewHolder.isAnchorLive()){
+                                mLiveRoomViewHolder.setGiftWall(data.getEnterRoomInfo().getGiftWallLightenNumber(), data.getEnterRoomInfo().getGiftWallLightenTotal());
+                            }else {
+                                mLiveRoomViewHolder.setGiftWall(data.getEnterRoomInfo().getWeekStarGiftNum(), data.getEnterRoomInfo().getWeekGiftIlluminateNum());
+                            }
+
                         }
 
                         //奖池等级

main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java

@@ -107,7 +107,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
     private TextView btnCopy;
     private SVGAImageView gift_svga;
     private View v_noble;
-    private FrameLayout lt_noble;
+    private View lt_noble;
     //    private LinearLayout btnUserNoble;
     private ImageView user_noble_ico, good_nub_ico, img_lv_pic;
     private TextView user_noble_text, user_noble_time, tv_setting;
@@ -165,7 +165,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
         user_noble_text = (TextView) findViewById(R.id.user_noble_text);
         img_setting = (ImageView) findViewById(R.id.img_setting);
         v_noble = (View) findViewById(R.id.v_noble);
-        lt_noble = (FrameLayout) findViewById(R.id.lt_noble);
+        lt_noble =  findViewById(R.id.lt_noble);
         user_noble_time = (TextView) findViewById(R.id.user_noble_time);
         banner_me = (Banner) findViewById(R.id.banner_me);
         lt_advertisement = (LinearLayout) findViewById(R.id.lt_advertisement);

main/src/main/res/layout/view_main_me.xml

@@ -541,18 +541,17 @@
 
 
                         <TextView
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="@+id/user_noble_text"
                             android:id="@+id/user_noble_time"
                             android:layout_width="0dp"
-                            android:layout_marginBottom="2dp"
-                            android:layout_marginEnd="6dp"
                             android:layout_height="wrap_content"
+                            android:layout_marginEnd="6dp"
                             android:layout_marginTop="12dp"
                             android:text="@string/open_noble_text"
                             android:textColor="#000000"
-                            android:textSize="12sp" />
+                            android:textSize="12sp"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="@+id/user_noble_text"
+                            app:layout_constraintTop_toBottomOf="@+id/user_noble_text" />
 
                     </androidx.constraintlayout.widget.ConstraintLayout>