diff --git a/app/src/main/assets/svga/box_notify.svga b/app/src/main/assets/svga/box_notify.svga index 0ed4e574a..5073a7252 100644 Binary files a/app/src/main/assets/svga/box_notify.svga and b/app/src/main/assets/svga/box_notify.svga differ 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 2635d4771..957337084 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 @@ -51,6 +51,7 @@ import com.yizhuan.xchat_android_core.user.bean.UserInfo import com.yizhuan.xchat_android_core.utils.subAndReplaceDot import com.yizhuan.xchat_android_library.utils.ListUtils import com.yizhuan.xchat_android_library.utils.ResUtil +import com.yizhuan.xchat_android_library.utils.StringUtils import io.reactivex.Observable import io.reactivex.ObservableEmitter import io.reactivex.ObservableOnSubscribe @@ -155,14 +156,17 @@ class RoomEffectBoxView @JvmOverloads constructor( RoomEvent.DATING_ALL_NOTIFY -> addDatingAllNotify(roomEvent.chatRoomMessage) RoomEvent.RADISH_NOTIFY, RoomEvent.RADISH_NOTIFY_SVGA -> addRadishNotify(roomEvent.chatRoomMessage) + RoomEvent.ROOM_GIFT_COMPOUND -> addGiftCompoundNotify(roomEvent.chatRoomMessage) RoomEvent.DATING_PUBLISH_RESULT -> showHandAnim((roomEvent.chatRoomMessage.attachment as DatingAttachment).datingNotifyInfo) RoomEvent.RECEIVE_MEMBER_IN_NOTICE -> //進入房間 addMemberInNotify(roomEvent.chatRoomMessage) + RoomEvent.RECEIVE_EXPER_LEVEL_UP_NOTICE -> addLevelUpNotify(roomEvent.chatRoomMessage) RoomEvent.ENTER_ROOM -> if (!SuperAdminUtil.isSuperAdmin()) { playCarSvga(AuthModel.get().currentUid.toString(), null, true) } + RoomEvent.CAR_MEMBER_IN -> if (roomEvent.mRoomCarMsgAttachment != null) { playCarSvga( null, @@ -174,6 +178,7 @@ class RoomEffectBoxView @JvmOverloads constructor( false ) } + RoomEvent.ROOM_PK_NOTIFY -> addRoomPKNotify(roomEvent.chatRoomMessage) RoomEvent.SINGLE_ROOM_PK_NOTIFY -> addSingleRoomPKNotify(roomEvent.chatRoomMessage) RoomEvent.SINGLE_ROOM_RANK_TOP_NOTIFY -> showSingleRoomRankNotify(roomEvent.chatRoomMessage) @@ -182,9 +187,11 @@ class RoomEffectBoxView @JvmOverloads constructor( isHideCarEffect = true loopCarAnim() } + RoomEvent.ROOM_CAR_EFFECT_SHOW -> { isHideCarEffect = false } + RoomEvent.DRAW_GIFT_EFFECT -> { val drawGiftAttachment = (roomEvent.chatRoomMessage?.attachment as? DrawGiftAttachment) @@ -195,6 +202,7 @@ class RoomEffectBoxView @JvmOverloads constructor( false ) } + else -> {} } } @@ -389,7 +397,7 @@ class RoomEffectBoxView @JvmOverloads constructor( ForegroundColorSpan(Color.WHITE) ) .append( - attachment.nick + " ", + StringUtils.abbreviate(attachment.nick, 8) + " ", ForegroundColorSpan(resources.getColor(R.color.notice_nick)) ) .append( @@ -432,7 +440,7 @@ class RoomEffectBoxView @JvmOverloads constructor( 1.0f, 0.0f, false - ), "noble_text_tx" + ), "bg" ) val drawable = SVGADrawable(videoItem, dynamicEntity) svgaImageView.setImageDrawable(drawable) 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 8977c1fc8..120d6cdaf 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 @@ -1074,7 +1074,7 @@ class RoomEffectView @JvmOverloads constructor( ForegroundColorSpan(Color.WHITE) ) .append( - attachment.nick + " ", + StringUtils.abbreviate(attachment.nick, 8) + " ", ForegroundColorSpan(resources.getColor(R.color.notice_nick)) ) .append( @@ -1120,7 +1120,7 @@ class RoomEffectView @JvmOverloads constructor( 1.0f, 0.0f, false - ), "noble_text_tx" + ), "bg" ) val drawable = SVGADrawable(videoItem, dynamicEntity) svgaImageView.setImageDrawable(drawable) diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllPlayEffectDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllPlayEffectDialog.java index 78fbe413a..69055c9bf 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllPlayEffectDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllPlayEffectDialog.java @@ -41,6 +41,7 @@ import com.yizhuan.xchat_android_core.im.custom.bean.PlayEffectInfo; import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeInfo; import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean; import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.yizhuan.xchat_android_library.utils.StringUtils; public class AllPlayEffectDialog extends BaseDialog { @@ -92,7 +93,7 @@ public class AllPlayEffectDialog extends BaseDialog { new ForegroundColorSpan(Color.WHITE) ) .append( - roomBoxPrizeInfo.getNick() + " ", + StringUtils.abbreviate(roomBoxPrizeInfo.getNick(), 8) + " ", new ForegroundColorSpan(ContextCompat.getColor(getContext(), R.color.notice_nick)) ) .append( @@ -138,7 +139,7 @@ public class AllPlayEffectDialog extends BaseDialog { 1.0f, 0.0f, false - ), "noble_text_tx"); + ), "bg"); SVGADrawable drawable = new SVGADrawable(svgaVideoEntity, dynamicEntity); svgaImageView.setImageDrawable(drawable); svgaImageView.stepToFrame(0, true);