Skip to content

Commit 8ba123f

Browse files
committed
fix : 알람 울리고 MainActivity 오면서 MapFragment 이슈 해결
1 parent 086d74c commit 8ba123f

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

presentation/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
android:name=".MainActivity"
4242
android:excludeFromRecents="true"
4343
android:exported="true"
44+
android:launchMode="singleTask"
4445
android:showOnLockScreen="true"
4546
android:theme="@style/Theme.Splash">
4647

presentation/src/main/java/com/stop/AlarmReceiver.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class AlarmReceiver : BroadcastReceiver() {
2828

2929
val pendingIntent = PendingIntent.getActivity(context, alarmCode, Intent(context, MainActivity::class.java).apply {
3030
putExtra("ALARM_CODE", alarmCode)
31-
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
3231
}, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
3332

3433
val builder = NotificationCompat.Builder(context, ALARM_RECEIVER_CHANNEL_ID)
@@ -50,7 +49,6 @@ class AlarmReceiver : BroadcastReceiver() {
5049

5150
Intent(context, MainActivity::class.java).apply {
5251
putExtra("ALARM_CODE", alarmCode)
53-
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
5452
context.startActivity(this)
5553
}
5654
}

presentation/src/main/java/com/stop/MainActivity.kt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.stop
22

33
import android.app.KeyguardManager
44
import android.content.Context
5+
import android.content.Intent
56
import android.graphics.Rect
67
import android.os.Bundle
78
import android.view.MotionEvent
@@ -19,6 +20,17 @@ import dagger.hilt.android.AndroidEntryPoint
1920
class MainActivity : AppCompatActivity() {
2021
private lateinit var binding: ActivityMainBinding
2122

23+
override fun onNewIntent(intent: Intent?) {
24+
super.onNewIntent(intent)
25+
26+
val navHostFragment = supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
27+
val inflater = navHostFragment.navController.navInflater
28+
val graph = inflater.inflate(R.navigation.nav_graph)
29+
graph.setStartDestination(R.id.alarmStartFragment)
30+
31+
navHostFragment.navController.graph = graph
32+
}
33+
2234
override fun onCreate(savedInstanceState: Bundle?) {
2335
installSplashScreen()
2436

@@ -27,21 +39,10 @@ class MainActivity : AppCompatActivity() {
2739
binding = ActivityMainBinding.inflate(layoutInflater)
2840
setContentView(binding.root)
2941

30-
setStartDestination()
3142
hideStatusBar()
3243
showOverLockScreen()
3344
}
3445

35-
private fun setStartDestination() {
36-
intent.extras?.getInt("ALARM_CODE")?.let {
37-
val navHostFragment = supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
38-
val inflater = navHostFragment.navController.navInflater
39-
val graph = inflater.inflate(R.navigation.nav_graph)
40-
graph.setStartDestination(R.id.alarmStartFragment)
41-
42-
navHostFragment.navController.graph = graph
43-
}
44-
}
4546

4647
private fun hideStatusBar() {
4748
window.setFlags(

presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class AlarmSettingFragment : Fragment() {
131131

132132
private fun makeAlarm() {
133133
//TODO 알람 바꿔야함
134-
alarmFunctions.callAlarm("10:00:00", 4, 123, "막차알림")
134+
alarmFunctions.callAlarm("00:00:05", 4, 123, "막차알림")
135135
}
136136

137137
private fun makeAlarmWorker() {

presentation/src/main/java/com/stop/ui/map/MapTMap.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import com.skt.tmap.poi.TMapPOIItem
1010
import com.stop.model.Location
1111
import com.stop.ui.util.Marker
1212
import com.stop.ui.util.TMap
13-
import java.util.ArrayList
1413

1514
class MapTMap(
1615
context: Context,

0 commit comments

Comments
 (0)