From bb944f79032847bf3d98935d43997adc273ea8a4 Mon Sep 17 00:00:00 2001 From: klaus Date: Wed, 8 Jan 2025 23:10:20 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=94=94=EC=85=98=20-=20=EC=98=A4?= =?UTF-8?q?=EB=94=94=EC=85=98=20=EC=95=8C=EB=A6=BC=20-=20=ED=91=B8?= =?UTF-8?q?=EC=8B=9C=20=EC=95=8C=EB=A6=BC=EC=9D=84=20=EB=88=84=EB=A5=B4?= =?UTF-8?q?=EB=A9=B4=20=EC=98=A4=EB=94=94=EC=85=98=20=ED=83=AD=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/fcm/SodaFirebaseMessagingService.kt | 5 +++++ .../java/kr/co/vividnext/sodalive/main/MainActivity.kt | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/fcm/SodaFirebaseMessagingService.kt b/app/src/main/java/kr/co/vividnext/sodalive/fcm/SodaFirebaseMessagingService.kt index 4001c4d..57aea1a 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/fcm/SodaFirebaseMessagingService.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/fcm/SodaFirebaseMessagingService.kt @@ -71,6 +71,11 @@ class SodaFirebaseMessagingService : FirebaseMessagingService() { intent.putExtra(Constants.EXTRA_USER_ID, channelId.toLong()) } + val auditionId = messageData["audition_id"] + if (auditionId != null) { + intent.putExtra(Constants.EXTRA_AUDITION_ID, auditionId.toLong()) + } + val pendingIntent = PendingIntent.getActivity( this, diff --git a/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt index c5bb859..0e288f0 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt @@ -248,6 +248,7 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl val roomId = bundle.getLong(Constants.EXTRA_ROOM_ID) val channelId = bundle.getLong(Constants.EXTRA_USER_ID) val messageId = bundle.getLong(Constants.EXTRA_MESSAGE_ID) + val auditionId = bundle.getLong(Constants.EXTRA_AUDITION_ID) val contentId = bundle.getLong(Constants.EXTRA_AUDIO_CONTENT_ID) val isLiveReservation = bundle.getBoolean(Constants.EXTRA_LIVE_RESERVATION_RESPONSE) @@ -286,6 +287,13 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl setTabSelected(binding.tabMy, isSelected = false) setTabSelected(binding.tabContent, isSelected = false) }, 500) + } else if (auditionId > 0) { + changeFragment(MainViewModel.CurrentTab.AUDITION) + setTabSelected(binding.tabAudition, isSelected = true) + setTabSelected(binding.tabLive, isSelected = false) + setTabSelected(binding.tabMessage, isSelected = false) + setTabSelected(binding.tabMy, isSelected = false) + setTabSelected(binding.tabContent, isSelected = false) } } catch (_: IllegalStateException) { }