moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修复房间内福袋飘窗文本展示问题；增加跳转提示

Browse Source
This commit is contained in:
Max
2024-01-05 11:07:32 +08:00
parent ef8d9b0b6f
commit de6a4fe524
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt
View File

@@ -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)
}
}
}

2
app/src/main/res/values/strings.xml
View File

@@ -1809,7 +1809,7 @@
<string name="avroom_widget_roomeffectview_025">恭喜</string>
<string name="avroom_widget_roomeffectview_026">恭喜&lt;font color=&quot;#FFEE8F&quot;&gt;%s&lt;/font&gt;在幸運塔羅中運氣爆發，獲得&lt;font color=&quot;#FFEE8F&quot;&gt;%d&lt;/font&gt;钻石！</string>
<string name="avroom_widget_roomeffectview_027">運氣爆表！在</string>
<string name="avroom_widget_roomeffectview_028">中開出了\n價值</string>
<string name="avroom_widget_roomeffectview_028">中開出了價值</string>
<string name="avroom_widget_roomeffectview_029">的</string>
<string name="avroom_widget_roomranknavigatoradapter_01">貢獻榜</string>
<string name="avroom_widget_roomranknavigatoradapter_02">魅力榜</string>