diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java index d326afdcb..7892aa48f 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java @@ -1664,7 +1664,7 @@ public class MessageView extends FrameLayout { text.append(" x" + attachment.getPrizeNum() + " ", new ForegroundColorSpan(roomTipColor)); } if (attachment.getSecond() == CUSTOM_MSG_SUB_BOX_ME) { - text.append("仅自己可见", new ForegroundColorSpan(Color.WHITE)); + text.append("(仅自己可见)", new ForegroundColorSpan(Color.WHITE)); } tvContent.setText(text.build()); } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt index e5c5f6083..48176be2c 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt @@ -1020,10 +1020,13 @@ class RoomEffectView @JvmOverloads constructor( } val msgBean = (chatRoomMessage.attachment as RoomRankAttachment).msgBean val rootView = LayoutInflater.from(mContext).inflate(R.layout.layout_room_rank_notify, null) - (rootView.findViewById(R.id.tv_nick) as TextView).text = - msgBean.title.subAndReplaceDot(6) - (rootView.findViewById(R.id.tv_desc) as TextView).text = msgBean.desc - ImageLoadUtils.loadImage(context, msgBean.avatar, rootView.findViewById(R.id.iv_avatar)) + val textView = rootView.findViewById(R.id.tv_content) + val text = MessageView.SpannableBuilder(textView) + .append("恭喜", ForegroundColorSpan(Color.WHITE)) + .append("「${msgBean.title}」房间", Color.parseColor("#FFFC4C")) + .append(msgBean.desc, ForegroundColorSpan(Color.WHITE)) + .append("TOP1", ForegroundColorSpan(Color.parseColor("#FFFC4C"))) + textView.text = text.build() rootView.setOnClickListener { AVRoomActivity.start(context, msgBean.uid) } binding.flSingleRoomRankNotify.addView(rootView) animationLuckyGift = AnimationUtils.loadAnimation(mContext, R.anim.anim_box_notify) diff --git a/app/src/main/res/drawable-xhdpi/room_bg_rank_go_room.png b/app/src/main/res/drawable-xhdpi/room_bg_rank_go_room.png new file mode 100644 index 000000000..f2a0208fa Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/room_bg_rank_go_room.png differ diff --git a/app/src/main/res/drawable-xhdpi/room_bg_rank_notice.png b/app/src/main/res/drawable-xhdpi/room_bg_rank_notice.png new file mode 100644 index 000000000..655673876 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/room_bg_rank_notice.png differ diff --git a/app/src/main/res/layout/layout_room_rank_notify.xml b/app/src/main/res/layout/layout_room_rank_notify.xml index 4c93aaa46..3c416a87a 100644 --- a/app/src/main/res/layout/layout_room_rank_notify.xml +++ b/app/src/main/res/layout/layout_room_rank_notify.xml @@ -5,55 +5,28 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center_horizontal" - android:background="@drawable/single_room_bg_rank_notice" + android:background="@drawable/room_bg_rank_notice" android:gravity="center" android:orientation="horizontal" android:paddingTop="4dp" tools:layout_height="60dp"> + + - - - - - - - - + android:layout_marginStart="5dp" + android:layout_marginEnd="7dp" + android:src="@drawable/room_bg_rank_go_room" /> \ No newline at end of file