diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectBoxView.kt b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectBoxView.kt index 957337084..710c406b8 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectBoxView.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectBoxView.kt @@ -181,7 +181,7 @@ class RoomEffectBoxView @JvmOverloads constructor( RoomEvent.ROOM_PK_NOTIFY -> addRoomPKNotify(roomEvent.chatRoomMessage) RoomEvent.SINGLE_ROOM_PK_NOTIFY -> addSingleRoomPKNotify(roomEvent.chatRoomMessage) - RoomEvent.SINGLE_ROOM_RANK_TOP_NOTIFY -> showSingleRoomRankNotify(roomEvent.chatRoomMessage) + RoomEvent.SINGLE_ROOM_RANK_TOP_NOTIFY -> showRoomRankNotify(roomEvent.chatRoomMessage) RoomEvent.ROOM_RANK_TOP_NOTIFY -> showRoomRankNotify(roomEvent.chatRoomMessage) RoomEvent.ROOM_CAR_EFFECT_HIDE -> { isHideCarEffect = true @@ -1219,27 +1219,6 @@ class RoomEffectBoxView @JvmOverloads constructor( ) } - private fun showSingleRoomRankNotify(chatRoomMessage: ChatRoomMessage) { - if (binding.clNotify.visibility == GONE) { - binding.clNotify.visibility = VISIBLE - } - val roomPkBean = (chatRoomMessage.attachment as SingleRoomRankAttachment).msgBean - val rootView = - LayoutInflater.from(mContext).inflate(R.layout.layout_single_room_rank_notify, null) - (rootView.findViewById(R.id.tv_nick) as TextView).text = - roomPkBean.nick.subAndReplaceDot(6) - (rootView.findViewById(R.id.tv_desc) as TextView).text = roomPkBean.desc - rootView.findViewById(R.id.iv_avatar).load(roomPkBean.avatar) - rootView.setOnClickListener { AVRoomActivity.start(context, roomPkBean.uid) } - binding.flSingleRoomRankNotify.addView(rootView) - animationLuckyGift = AnimationUtils.loadAnimation(mContext, R.anim.anim_box_notify) - rootView.startAnimation(animationLuckyGift) - binding.flSingleRoomRankNotify.postDelayed({ - binding.flSingleRoomRankNotify.removeView( - rootView - ) - }, SHOW_TIME.toLong()) - } private fun showRoomRankNotify(chatRoomMessage: ChatRoomMessage) { if (binding.clNotify.visibility == GONE) { 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 120d6cdaf..1fcfc065f 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 @@ -229,7 +229,7 @@ class RoomEffectView @JvmOverloads constructor( RoomEvent.ROOM_PK_NOTIFY -> addRoomPKNotify(roomEvent.chatRoomMessage) RoomEvent.SINGLE_ROOM_PK_NOTIFY -> addSingleRoomPKNotify(roomEvent.chatRoomMessage) - RoomEvent.SINGLE_ROOM_RANK_TOP_NOTIFY -> showSingleRoomRankNotify(roomEvent.chatRoomMessage) + RoomEvent.SINGLE_ROOM_RANK_TOP_NOTIFY -> showRoomRankNotify(roomEvent.chatRoomMessage) RoomEvent.ROOM_RANK_TOP_NOTIFY -> showRoomRankNotify(roomEvent.chatRoomMessage) RoomEvent.ROOM_CAR_EFFECT_HIDE -> { isHideCarEffect = true @@ -1899,27 +1899,6 @@ class RoomEffectView @JvmOverloads constructor( ) } - private fun showSingleRoomRankNotify(chatRoomMessage: ChatRoomMessage) { - if (binding.clNotify.visibility == GONE) { - binding.clNotify.visibility = VISIBLE - } - val roomPkBean = (chatRoomMessage.attachment as SingleRoomRankAttachment).msgBean - val rootView = - LayoutInflater.from(mContext).inflate(R.layout.layout_single_room_rank_notify, null) - (rootView.findViewById(R.id.tv_nick) as TextView).text = - roomPkBean.nick.subAndReplaceDot(6) - (rootView.findViewById(R.id.tv_desc) as TextView).text = roomPkBean.desc - rootView.findViewById(R.id.iv_avatar).load(roomPkBean.avatar) - rootView.setOnClickListener { AVRoomActivity.start(context, roomPkBean.uid) } - binding.flSingleRoomRankNotify.addView(rootView) - animationLuckyGift = AnimationUtils.loadAnimation(mContext, R.anim.anim_box_notify) - rootView.startAnimation(animationLuckyGift) - binding.flSingleRoomRankNotify.postDelayed({ - binding.flSingleRoomRankNotify.removeView( - rootView - ) - }, SHOW_TIME.toLong()) - } private fun showRoomRankNotify(chatRoomMessage: ChatRoomMessage) { if (binding.clNotify.visibility == GONE) { 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 deleted file mode 100644 index f2a0208fa..000000000 Binary files a/app/src/main/res/drawable-xhdpi/room_bg_rank_go_room.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/room_bg_rank_go_room.webp b/app/src/main/res/drawable-xhdpi/room_bg_rank_go_room.webp new file mode 100644 index 000000000..85a3357d5 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/room_bg_rank_go_room.webp 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 deleted file mode 100644 index 655673876..000000000 Binary files a/app/src/main/res/drawable-xhdpi/room_bg_rank_notice.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/room_bg_rank_notice.webp b/app/src/main/res/drawable-xhdpi/room_bg_rank_notice.webp new file mode 100644 index 000000000..eba0725cb Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/room_bg_rank_notice.webp differ diff --git a/app/src/main/res/drawable-xhdpi/single_room_bg_rank_notice.png b/app/src/main/res/drawable-xhdpi/single_room_bg_rank_notice.png deleted file mode 100644 index 84957784a..000000000 Binary files a/app/src/main/res/drawable-xhdpi/single_room_bg_rank_notice.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/single_room_bg_rank_notice_btn.png b/app/src/main/res/drawable-xhdpi/single_room_bg_rank_notice_btn.png deleted file mode 100644 index 249430899..000000000 Binary files a/app/src/main/res/drawable-xhdpi/single_room_bg_rank_notice_btn.png and /dev/null differ diff --git a/app/src/main/res/layout/layout_single_room_rank_notify.xml b/app/src/main/res/layout/layout_single_room_rank_notify.xml index 874884e03..22477f409 100644 --- a/app/src/main/res/layout/layout_single_room_rank_notify.xml +++ b/app/src/main/res/layout/layout_single_room_rank_notify.xml @@ -4,7 +4,7 @@ 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"