Merge pull request #83 from boostcampwm-2022/81-alarm-bug-fix

[PR] 알람 일부 버그수정 ㅠㅠ

Author: koreatlwls

presentation/src/main/AndroidManifest.xml

@@ -28,10 +28,10 @@
         tools:targetApi="31">
 
         <receiver
-            android:name=".AlarmReceiver"
+            android:name=".alarm.AlarmReceiver"
             android:enabled="true" />
 
-        <service android:name=".SoundService" />
+        <service android:name=".alarm.SoundService" />
 
         <provider
             android:name="androidx.startup.InitializationProvider"

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

@@ -25,6 +25,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
+        setIntent(intent)
 
         intent?.extras?.getInt("ALARM_CODE")?.let {
             if (it == ALARM_CODE) {

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

@@ -0,0 +1,45 @@
+package com.stop.alarm
+
+import android.app.AlarmManager
+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.getAlarmSettingNotification
+import com.stop.util.getAlarmSettingPendingIntent
+import com.stop.util.getAlarmStartPendingIntent
+
+class AlarmFunctions(
+    private val context: Context
+) {
+    fun callAlarm(lastTime: String, alarmTime: Int) {
+        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+        val alarmSettingPendingIntent = context.getAlarmSettingPendingIntent()
+        val alarmSettingNotification = context.getAlarmSettingNotification(
+            alarmSettingPendingIntent,
+            "알람이 막차시간 ${lastTime}에서 ${alarmTime}전에 울릴예정입니다."
+        )
+        notificationManager.notify(ALARM_NOTIFICATION_ID, alarmSettingNotification)
+
+        val alarmReceiverPendingIntent = context.getAlarmStartPendingIntent()
+
+        val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+        alarmManager.setExactAndAllowWhileIdle(
+            AlarmManager.RTC_WAKEUP,
+            makeFullTime(lastTime).timeInMillis - (alarmTime * 60 * 1000),
+            alarmReceiverPendingIntent
+        )
+    }
+
+    fun cancelAlarm() {
+        val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+        val alarmReceiverPendingIntent = context.getAlarmStartPendingIntent()
+
+        alarmManager.cancel(alarmReceiverPendingIntent)
+
+        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.cancel(ALARM_NOTIFICATION_ID)
+    }
+
+}

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

@@ -0,0 +1,65 @@
+package com.stop.alarm
+
+import android.app.NotificationManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+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 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 (context.isScreenOn()) {
+            if (isMoreThanOreo()) {
+                context.startForegroundService(soundServiceIntent)
+            } else {
+                context.startService(soundServiceIntent)
+            }
+
+            val alarmStartPendingIntent = context.getAlarmReceiverPendingIntent()
+            val alarmStartNotification = context.getAlarmScreenOnNotification(alarmStartPendingIntent, content)
+
+            notificationManager.notify(ALARM_NOTIFICATION_ID, alarmStartNotification)
+
+            /*Intent(context, MainActivity::class.java).apply {
+                putExtra("ALARM_CODE", ALARM_CODE)
+                context.startActivity(this)
+            }*/
+        } else {
+            if (isMoreThanOreo()) {
+                context.startForegroundService(soundServiceIntent)
+
+                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)
+                }
+            }
+        }
+
+    }
+
+}

presentation/src/main/java/com/stop/alarm/AlarmFunctions.kt

@@ -1,4 +1,4 @@
-package com.stop
+package com.stop.alarm
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -9,8 +9,10 @@ import androidx.work.CoroutineWorker
 import androidx.work.ForegroundInfo
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
+import com.stop.R
 import com.stop.domain.usecase.nearplace.GetNearPlacesUseCase
-import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_CODE
+import com.stop.isMoreThanOreo
+import com.stop.makeFullTime
 import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_TIME
 import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.LAST_TIME
 import dagger.assisted.Assisted
@@ -91,8 +93,8 @@ class LastTimeCheckWorker @AssistedInject constructor(
 
             if(lastTime != resultLastTime && resultLastTime != null){
                 lastTime = resultLastTime
-                alarmFunctions.cancelAlarm(ALARM_CODE)
-                alarmFunctions.callAlarm(resultLastTime, alarmTime, ALARM_CODE)
+                alarmFunctions.cancelAlarm()
+                alarmFunctions.callAlarm(resultLastTime, alarmTime)
             }
 
             val delayTime = getDelayTime()

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

@@ -1,4 +1,4 @@
-package com.stop
+package com.stop.alarm
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -10,6 +10,7 @@ import android.os.*
 import androidx.core.app.NotificationCompat
 import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.lifecycleScope
+import com.stop.*
 import com.stop.domain.usecase.alarm.DeleteAlarmUseCase
 import com.stop.domain.usecase.alarm.GetAlarmUseCase
 import dagger.hilt.android.AndroidEntryPoint

presentation/src/main/java/com/stop/LastTimeCheckWorker.kt renamed to presentation/src/main/java/com/stop/alarm/LastTimeCheckWorker.kt

@@ -2,7 +2,7 @@ package com.stop.di
 
 import android.content.Context
 import androidx.work.WorkManager
-import com.stop.AlarmFunctions
+import com.stop.alarm.AlarmFunctions
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

presentation/src/main/java/com/stop/SoundService.kt renamed to presentation/src/main/java/com/stop/alarm/SoundService.kt

@@ -123,6 +123,8 @@ class AlarmSettingFragment : Fragment() {
 
     companion object {
         const val ALARM_CODE = 123
+        const val ALARM_MAP_CODE = 122
+        const val ALARM_NOTIFICATION_ID = 121
         const val LAST_TIME = "lastTime"
         const val ALARM_TIME = "alarmTime"
     }