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 8fb0fe3b7..75ff35a79 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
@@ -44,6 +44,8 @@ import com.yizhuan.erban.ui.utils.load
import com.yizhuan.erban.ui.utils.loadAnim
import com.yizhuan.erban.ui.webview.CommonWebViewActivity
import com.yizhuan.erban.ui.widget.SimpleAnimListener
+import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftGoRoomTipsDialog
+import com.yizhuan.erban.ui.widget.dialog.AllServiceGiftGoRoomTipsDialog.Companion.isNeedTips
import com.yizhuan.erban.ui.widget.drawgift.DrawGiftPlayHelper
import com.yizhuan.erban.utils.MsgBuilder
import com.yizhuan.erban.utils.RegexUtil
@@ -633,7 +635,7 @@ class RoomEffectView @JvmOverloads constructor(
}
messageTextView.text = text.build()
roomView.setOnClickListener {
- AVRoomActivity.start(mContext, noticeInfo.roomUid)
+ goRoom(noticeInfo.roomTitle, noticeInfo.roomUid)
}
animationPlay = AnimationUtils.loadAnimation(mContext, R.anim.anim_box_notify)
binding.flLuckyBagNotify.addView(roomView)
@@ -1885,4 +1887,17 @@ class RoomEffectView @JvmOverloads constructor(
playNotifyStateLiveData?.value = false
}
+ private fun goRoom(roomTitle: String, roomUid: Long) {
+ if (roomUid <= 0L) {
+ return
+ }
+ if (roomUid == AvRoomDataManager.get().roomUid) {
+ return
+ }
+ if (isNeedTips()) {
+ AllServiceGiftGoRoomTipsDialog(context, roomTitle, roomUid).show()
+ } else {
+ AVRoomActivity.start(context, roomUid)
+ }
+ }
}
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c87e403c..3d275e11c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1809,7 +1809,7 @@
恭喜
恭喜<font color="#FFEE8F">%s</font>在幸運塔羅中運氣爆發,獲得<font color="#FFEE8F">%d</font>钻石!
運氣爆表!在
- 中開出了\n價值
+ 中開出了價值
的
貢獻榜
魅力榜