From 1720173a16cabe90f5a5ff94f5441e8f76643a38 Mon Sep 17 00:00:00 2001 From: klaus Date: Fri, 9 May 2025 11:55:56 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20fcm=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=88=98=EC=8B=A0=20=EC=88=98=EC=A0=95=20-=20data-only,=20noti?= =?UTF-8?q?fication+data=20=EB=B0=A9=EC=8B=9D=20=EB=AA=A8=EB=91=90=20?= =?UTF-8?q?=EB=8F=99=EC=9D=BC=ED=95=98=EA=B2=8C=20=EB=94=A5=EB=A7=81?= =?UTF-8?q?=ED=81=AC=EA=B0=80=20=EC=A0=81=EC=9A=A9=EB=90=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/main/MainActivity.kt | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) 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 ad1c8b1..33e3634 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 @@ -45,6 +45,7 @@ import kr.co.vividnext.sodalive.databinding.ItemMainTabBinding import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity import kr.co.vividnext.sodalive.extensions.dpToPx import kr.co.vividnext.sodalive.live.LiveFragment +import kr.co.vividnext.sodalive.message.MessageActivity import kr.co.vividnext.sodalive.mypage.MyPageFragment import kr.co.vividnext.sodalive.settings.event.EventDetailActivity import kr.co.vividnext.sodalive.settings.notification.NotificationSettingsDialog @@ -230,7 +231,7 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl getMemberInfo() val intentFilter = IntentFilter(Constants.ACTION_MAIN_AUDIO_CONTENT_RECEIVER) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - registerReceiver(audioContentReceiver, intentFilter, Context.RECEIVER_NOT_EXPORTED) + registerReceiver(audioContentReceiver, intentFilter, RECEIVER_NOT_EXPORTED) } else { registerReceiver(audioContentReceiver, intentFilter) } @@ -273,11 +274,16 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl bundle != null ) { try { - 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 roomId = bundle.getString("room_id")?.toLong() + ?: bundle.getLong(Constants.EXTRA_ROOM_ID) + val channelId = bundle.getString("channel_id")?.toLong() + ?: bundle.getLong(Constants.EXTRA_USER_ID) + val messageId = bundle.getString("message_id")?.toLong() + ?: bundle.getLong(Constants.EXTRA_MESSAGE_ID) + val auditionId = bundle.getString("audition_id")?.toLong() + ?: bundle.getLong(Constants.EXTRA_AUDITION_ID) + val contentId = bundle.getString("content_id")?.toLong() + ?: bundle.getLong(Constants.EXTRA_AUDIO_CONTENT_ID) val isLiveReservation = bundle.getBoolean(Constants.EXTRA_LIVE_RESERVATION_RESPONSE) if (roomId > 0) { @@ -302,7 +308,7 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl nextIntent.putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, contentId) startActivity(nextIntent) } else if (messageId > 0) { - // 메시지 페이지로 이동 + startActivity(Intent(applicationContext, MessageActivity::class.java)) } else if (auditionId > 0) { viewModel.clickTab(MainViewModel.CurrentTab.AUDITION) }