fix : AlarmReceiver 수정

koreatlwls · koreatlwls · commit d0ae83b88b62 · 2022-12-09T03:24:31.000+09:00
diff --git a/presentation/src/main/java/com/stop/alarm/AlarmFunctions.kt b/presentation/src/main/java/com/stop/alarm/AlarmFunctions.kt
@@ -5,9 +5,9 @@ import android.app.NotificationManager
 import android.content.Context
 import com.stop.makeFullTime
 import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_NOTIFICATION_ID
-import com.stop.util.getAlarmReceiverPendingIntent
 import com.stop.util.getAlarmSettingNotification
 import com.stop.util.getAlarmSettingPendingIntent
+import com.stop.util.getAlarmStartPendingIntent
 
 class AlarmFunctions(
     private val context: Context
@@ -22,7 +22,7 @@ class AlarmFunctions(
         )
         notificationManager.notify(ALARM_NOTIFICATION_ID, alarmSettingNotification)
 
-        val alarmReceiverPendingIntent = context.getAlarmReceiverPendingIntent()
+        val alarmReceiverPendingIntent = context.getAlarmStartPendingIntent()
 
         val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
         alarmManager.setExactAndAllowWhileIdle(
@@ -34,7 +34,7 @@ class AlarmFunctions(
 
     fun cancelAlarm() {
         val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-        val alarmReceiverPendingIntent = context.getAlarmReceiverPendingIntent()
+        val alarmReceiverPendingIntent = context.getAlarmStartPendingIntent()
 
         alarmManager.cancel(alarmReceiverPendingIntent)
 
diff --git a/presentation/src/main/java/com/stop/alarm/AlarmReceiver.kt b/presentation/src/main/java/com/stop/alarm/AlarmReceiver.kt
@@ -1,66 +1,65 @@
 package com.stop.alarm
 
-import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import androidx.core.app.NotificationCompat
-import com.stop.alarm.LastTimeCheckWorker.Companion.NOTIFICATION_ID
 import com.stop.MainActivity
 import com.stop.R
 import com.stop.isMoreThanOreo
+import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_CODE
+import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_NOTIFICATION_HIGH_ID
+import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_NOTIFICATION_ID
+import com.stop.util.getAlarmReceiverNotification
+import com.stop.util.getAlarmReceiverPendingIntent
+import com.stop.util.getAlarmScreenOnNotification
+import com.stop.util.isScreenOn
 
 class AlarmReceiver : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
-        val alarmCode = intent.extras?.getInt("ALARM_CODE") ?: -1
+        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.cancel(ALARM_NOTIFICATION_ID)
 
         val soundServiceIntent = Intent(context, SoundService::class.java)
+        val content = context.getString(R.string.alarm_content_text)
 
-        if (isMoreThanOreo()) {
-            context.startForegroundService(soundServiceIntent)
-
-            val id = context.getString(R.string.notification_channel_id)
-            val name = context.getString(R.string.notification_channel_name)
-
-            val notificationManager = context.getSystemService(NotificationManager::class.java)
-            if (notificationManager.getNotificationChannel(id) == null) {
-                NotificationChannel(id, name, NotificationManager.IMPORTANCE_HIGH).apply {
-                    notificationManager.createNotificationChannel(this)
-                }
+        if (context.isScreenOn()) {
+            if (isMoreThanOreo()) {
+                context.startForegroundService(soundServiceIntent)
+            } else {
+                context.startService(soundServiceIntent)
             }
 
-            val pendingIntent = PendingIntent.getActivity(context, alarmCode, Intent(context, MainActivity::class.java).apply {
-                putExtra("ALARM_CODE", alarmCode)
-            }, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
+            val alarmStartPendingIntent = context.getAlarmReceiverPendingIntent()
+            val alarmStartNotification = context.getAlarmScreenOnNotification(alarmStartPendingIntent, content)
 
-            val title = context.getString(R.string.notification_title)
-            val content = context.getString(R.string.alarm_content_text)
+            notificationManager.notify(ALARM_NOTIFICATION_ID, alarmStartNotification)
 
-            val builder = NotificationCompat.Builder(context, id)
-                .setSmallIcon(R.mipmap.ic_bus)
-                .setContentTitle(title)
-                .setContentText(content)
-                .setAutoCancel(true)
-                .setPriority(NotificationCompat.PRIORITY_HIGH)
-                .setCategory(NotificationCompat.CATEGORY_ALARM)
-                .setFullScreenIntent(pendingIntent, true)
-
-            try {
-                notificationManager.notify(NOTIFICATION_ID, builder.build())
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
+            /*Intent(context, MainActivity::class.java).apply {
+                putExtra("ALARM_CODE", ALARM_CODE)
+                context.startActivity(this)
+            }*/
         } else {
-            context.startService(soundServiceIntent)
+            if (isMoreThanOreo()) {
+                context.startForegroundService(soundServiceIntent)
 
-            Intent(context, MainActivity::class.java).apply {
-                putExtra("ALARM_CODE", alarmCode)
-                context.startActivity(this)
+                val alarmStartPendingIntent = context.getAlarmReceiverPendingIntent()
+                val alarmStartNotification = context.getAlarmReceiverNotification(
+                    alarmStartPendingIntent,
+                    content
+                )
+
+                notificationManager.notify(ALARM_NOTIFICATION_HIGH_ID, alarmStartNotification)
+            } else {
+                context.startService(soundServiceIntent)
+                Intent(context, MainActivity::class.java).apply {
+                    putExtra("ALARM_CODE", ALARM_CODE)
+                    context.startActivity(this)
+                }
             }
         }
+
     }
 
 }
diff --git a/presentation/src/main/java/com/stop/ui/map/MapFragment.kt b/presentation/src/main/java/com/stop/ui/map/MapFragment.kt
@@ -69,6 +69,7 @@ class MapFragment : Fragment(), MapHandler {
     }
 
     private fun initBinding() {
+        alarmViewModel.getAlarm()
         binding.lifecycleOwner = viewLifecycleOwner
         binding.alarmViewModel = alarmViewModel
         binding.placeSearchViewModel = placeSearchViewModel
@@ -137,8 +138,6 @@ class MapFragment : Fragment(), MapHandler {
 
         val behavior = BottomSheetBehavior.from(binding.layoutHomeBottomSheet)
 
-        alarmViewModel.getAlarm()
-
         alarmViewModel.isAlarmItemNotNull.asLiveData().observe(viewLifecycleOwner) {
             behavior.isDraggable = it
         }
diff --git a/presentation/src/main/java/com/stop/util/Context.kt b/presentation/src/main/java/com/stop/util/Context.kt
@@ -1,9 +1,6 @@
 package com.stop.util
 
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
+import android.app.*
 import android.content.Context
 import android.content.Intent
 import android.content.res.Resources
@@ -48,7 +45,7 @@ fun Context.getAlarmSettingNotification(pendingIntent: PendingIntent, content: S
         .build()
 }
 
-fun Context.getAlarmReceiverPendingIntent(): PendingIntent {
+fun Context.getAlarmStartPendingIntent(): PendingIntent {
     val intent = Intent(this, AlarmReceiver::class.java)
     intent.putExtra("ALARM_CODE", ALARM_CODE)
     return PendingIntent.getBroadcast(
@@ -59,14 +56,49 @@ fun Context.getAlarmReceiverPendingIntent(): PendingIntent {
     )
 }
 
+fun Context.isThisAppRunning() =
+    (getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager)
+        .runningAppProcesses
+        .firstOrNull()
+        ?.processName
+        ?.equals("com.stop")
+        ?: false
+
 fun Context.isScreenOn() =
     (getSystemService(Context.POWER_SERVICE) as PowerManager).isInteractive
 
-fun Context.getAlarmReceiverNotification(pendingIntent: PendingIntent, content: String): Notification {
+fun Context.getAlarmReceiverPendingIntent(): PendingIntent {
+    val intent = Intent(this, MainActivity::class.java)
+    intent.putExtra("ALARM_CODE", ALARM_CODE)
+    return PendingIntent.getActivity(
+        this,
+        ALARM_CODE,
+        intent,
+        PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+    )
+}
+
+fun Context.getAlarmScreenOnNotification(pendingIntent: PendingIntent, content : String) : Notification{
     val id = applicationContext.getString(R.string.notification_channel_id)
     val name = applicationContext.getString(R.string.notification_channel_name)
     val title = applicationContext.getString(R.string.notification_title)
 
+    createDefaultNotificationChannel(applicationContext, id, name)
+
+    return NotificationCompat.Builder(applicationContext, id)
+        .setContentTitle(title)
+        .setContentText(content)
+        .setSmallIcon(R.mipmap.ic_bus)
+        .setAutoCancel(true)
+        .setContentIntent(pendingIntent)
+        .build()
+}
+
+fun Context.getAlarmReceiverNotification(pendingIntent: PendingIntent, content: String): Notification {
+    val id = applicationContext.getString(R.string.notification_channel_high_id)
+    val name = applicationContext.getString(R.string.notification_channel_high_name)
+    val title = applicationContext.getString(R.string.notification_title)
+
     createHighNotificationChannel(applicationContext, id, name)
 
     return NotificationCompat.Builder(applicationContext, id)
@@ -76,6 +108,7 @@ fun Context.getAlarmReceiverNotification(pendingIntent: PendingIntent, content:
         .setAutoCancel(true)
         .setPriority(NotificationCompat.PRIORITY_HIGH)
         .setCategory(NotificationCompat.CATEGORY_ALARM)
+        .setContentIntent(pendingIntent)
         .setFullScreenIntent(pendingIntent, true)
         .build()
 }
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
@@ -45,6 +45,8 @@
     <string name="delete_recent_search_text">최근기록 삭제</string>
     <string name="notification_channel_id">notification_channel_id</string>
     <string name="notification_channel_name">notification_channel_name</string>
+    <string name="notification_channel_high_id">notification_channel_high_id</string>
+    <string name="notification_channel_high_name">notification_channel_high_name</string>
     <string name="notification_title">막차 알림</string>
     <string name="alarm_cancel_text">취소하기</string>
     <string name="alarm_content_text">막차를 타러 이제 나가야해요~!!</string>

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ class MapFragment : Fragment(), MapHandler {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`private fun initBinding() {`
	`72`	`+ alarmViewModel.getAlarm()`
`72`	`73`	`binding.lifecycleOwner = viewLifecycleOwner`
`73`	`74`	`binding.alarmViewModel = alarmViewModel`
`74`	`75`	`binding.placeSearchViewModel = placeSearchViewModel`
`@@ -137,8 +138,6 @@ class MapFragment : Fragment(), MapHandler {`
`137`	`138`
`138`	`139`	`val behavior = BottomSheetBehavior.from(binding.layoutHomeBottomSheet)`
`139`	`140`
`140`		`- alarmViewModel.getAlarm()`
`141`		`-`
`142`	`141`	`alarmViewModel.isAlarmItemNotNull.asLiveData().observe(viewLifecycleOwner) {`
`143`	`142`	`behavior.isDraggable = it`
`144`	`143`	`}`