Merge branch 'v2.2.0/float_gift' into v2.2.0/test

2023-10-31 10:19:48 +08:00
parent 7bf7e232d0 e56bbb5f8f
commit 2b6d66c31e
1 changed files with 5 additions and 1 deletions
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelDialog.kt
@@ -167,8 +167,12 @@ class AllServiceGiftLevelDialog : BaseDialog {
    private fun goRoom(
        data: AllServiceGiftProtocol.DataBean
    ) {
+        if (data.roomUid <= 0L) {
+            // 非房间场景送的礼物
+            return
+        }
        if (AllServiceGiftGoRoomTipsDialog.isNeedTips()) {
-            AllServiceGiftGoRoomTipsDialog(context, data.roomTitle, data.roomUid).show()
+            AllServiceGiftGoRoomTipsDialog(context, data.roomTitle ?: "", data.roomUid).show()
        } else {
            if (data.roomUid == JavaUtil.str2long(InitialModel.get().publicChatHallUid)) {
                PublicChatHallHomeActivity.openPublicChatHallPage(context)