diff --git a/common/src/main/res/layout/item_red_packet.xml b/common/src/main/res/layout/item_red_packet.xml index 130bb6199..0c50148ac 100644 --- a/common/src/main/res/layout/item_red_packet.xml +++ b/common/src/main/res/layout/item_red_packet.xml @@ -29,7 +29,13 @@ android:id="@+id/title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="TextView" + android:ellipsize="marquee" + android:focusable="true" + android:focusableInTouchMode="true" + android:marqueeRepeatLimit="marquee_forever" + android:maxEms="13" + android:singleLine="true" + android:text="攢人氣紅包 - 测试5.3版主播1的直播間123123123123" android:textColor="#000000" android:textSize="14sp" /> @@ -58,9 +64,9 @@ + app:layout_constraintStart_toStartOf="@+id/linearLayout" + app:layout_constraintTop_toBottomOf="@+id/linearLayout" /> \ No newline at end of file diff --git a/common/src/main/res/layout/item_user_red_packet.xml b/common/src/main/res/layout/item_user_red_packet.xml index 3a11a1cd2..1b148d1fc 100644 --- a/common/src/main/res/layout/item_user_red_packet.xml +++ b/common/src/main/res/layout/item_user_red_packet.xml @@ -9,8 +9,8 @@ android:id="@+id/avatar" android:layout_width="40dp" android:layout_height="40dp" - android:scaleType="centerCrop" android:layout_marginTop="10dp" + android:scaleType="centerCrop" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:riv_border_color="#FFFFFF" @@ -18,16 +18,6 @@ app:riv_oval="true" /> - - - - + app:layout_constraintTop_toTopOf="parent"> + + + + + + + app:layout_constraintStart_toStartOf="@+id/linearLayout" + app:layout_constraintTop_toBottomOf="@+id/linearLayout" /> \ No newline at end of file diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index d6d874917..5f32fae2e 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -687,7 +687,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe // .setRedPacketQuantity(100) // .setRedPacketRemain(6) // .setCountdown(360)); - }else { + } else { mLiveRoomViewHolder.hindeRedPacket(); } } @@ -2051,12 +2051,14 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLiveRoomViewHolder.blindBoxAllServerNotify(event); } } - public void redPacketManage(RedPacketModel redPacket) { + + public void redPacketManage(RedPacketModel redPacket) { if (mLiveRoomViewHolder != null) { mLiveRoomViewHolder.redPacketManage(redPacket); } } - public void setRedPacketInfoModel(RedPacketInfoModel redPacket) { + + public void setRedPacketInfoModel(RedPacketInfoModel redPacket) { if (mLiveRoomViewHolder != null) { mLiveRoomViewHolder.setRedPacketInfoModel(redPacket); } diff --git a/main/src/main/java/com/yunbao/main/adapter/RedPacketListRecyclerAdapter.java b/main/src/main/java/com/yunbao/main/adapter/RedPacketListRecyclerAdapter.java index 3dfa1bc92..8f56dd2dc 100644 --- a/main/src/main/java/com/yunbao/main/adapter/RedPacketListRecyclerAdapter.java +++ b/main/src/main/java/com/yunbao/main/adapter/RedPacketListRecyclerAdapter.java @@ -66,7 +66,7 @@ public class RedPacketListRecyclerAdapter extends RecyclerView.Adapter