diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index e406bcdf0..6f0775a87 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -4399,7 +4399,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis newWeekGroup = findViewById(R.id.newWeekGroup); if (!TextUtils.isEmpty(giftWallLightenNumber) && !TextUtils.isEmpty(giftWallLightenTotal)) { - if (isAnchorLive()) { + if (isAnchorLive()) { //主播是礼物墙 View view = newPart2Flipper.findViewWithTag("giftWall"); if (view == null) { view = LayoutInflater.from(mContext).inflate(R.layout.view_live_room_part2_item, null); diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 98bb329ea..548ac0ab8 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -1776,7 +1776,7 @@ layout="@layout/sim_live_room_anchor_say1" android:layout_width="96dp" android:layout_height="wrap_content" - android:layout_marginTop="190dp" + android:layout_marginTop="170dp" android:layout_marginStart="12dp" android:visibility="invisible" tools:visibility="visible"/> diff --git a/live/src/main/res/layout/view_live_room_part2.xml b/live/src/main/res/layout/view_live_room_part2.xml index 796c390ad..401326a48 100644 --- a/live/src/main/res/layout/view_live_room_part2.xml +++ b/live/src/main/res/layout/view_live_room_part2.xml @@ -205,6 +205,8 @@ android:layout_height="match_parent" android:layout_marginEnd="10dp" android:flipInterval="5000" + android:inAnimation="@anim/anim_marquee_in" + android:outAnimation="@anim/anim_marquee_out" tools:background="@drawable/bg_live_item_rank" app:layout_constraintDimensionRatio="2.4" app:layout_constraintEnd_toEndOf="parent" diff --git a/live/src/main/res/layout/view_live_room_part2_item.xml b/live/src/main/res/layout/view_live_room_part2_item.xml index a3e0114c4..cf91794b8 100644 --- a/live/src/main/res/layout/view_live_room_part2_item.xml +++ b/live/src/main/res/layout/view_live_room_part2_item.xml @@ -20,7 +20,7 @@ android:id="@+id/newItemImg" android:layout_width="0dp" android:layout_height="0dp" - android:src="@mipmap/ic_live_week_rank" + android:src="@mipmap/ic_live_part2_gift_wall" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1.05" app:layout_constraintEnd_toEndOf="@+id/newItemBgView" diff --git a/live/src/main/res/mipmap-hdpi/ic_live_part2_gift_wall.png b/live/src/main/res/mipmap-hdpi/ic_live_part2_gift_wall.png new file mode 100644 index 000000000..d903cf237 Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_live_part2_gift_wall.png differ diff --git a/live/src/main/res/mipmap-mdpi/ic_live_part2_gift_wall.png b/live/src/main/res/mipmap-mdpi/ic_live_part2_gift_wall.png new file mode 100644 index 000000000..195a2e5ca Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_live_part2_gift_wall.png differ diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_part2_gift_wall.png b/live/src/main/res/mipmap-xhdpi/ic_live_part2_gift_wall.png new file mode 100644 index 000000000..aeec64429 Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_live_part2_gift_wall.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_live_part2_gift_wall.png b/live/src/main/res/mipmap-xxxhdpi/ic_live_part2_gift_wall.png new file mode 100644 index 000000000..a8909414c Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_live_part2_gift_wall.png differ diff --git a/live/src/main/res/values-zh/strings.xml b/live/src/main/res/values-zh/strings.xml index 4da96c54a..db72d79af 100644 --- a/live/src/main/res/values-zh/strings.xml +++ b/live/src/main/res/values-zh/strings.xml @@ -173,6 +173,6 @@ 完成新人任務,可領多重專屬豪禮! 詳情 喜歡主播就關注ta吧~ - + <整蠱 diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml index 74b8e071a..835cdeea2 100644 --- a/live/src/main/res/values/strings.xml +++ b/live/src/main/res/values/strings.xml @@ -176,5 +176,6 @@ Complete the newcomer tasks and receive multiple gifts Details If you like this anchor, please subscribe to him. - 整蠱 + <trick + \ No newline at end of file