feat : 막차시간이 다가올수록 네트워크 호출 주기 변경 및 워크매니저에서 네트워크 호출 및 알람 설정 연결

Author: koreatlwls

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

@@ -11,13 +11,12 @@ class AlarmFunctions(
 
     private lateinit var pendingIntent: PendingIntent
 
-    fun callAlarm(lastTime: String, alarmTime: Int, alarmCode: Int, alarmContent: String) {
+    fun callAlarm(lastTime: String, alarmTime: Int, alarmCode: Int) {
         val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
 
         val receiverIntent = Intent(context, AlarmReceiver::class.java)
         receiverIntent.apply {
             putExtra("ALARM_CODE", alarmCode)
-            putExtra("ALARM_CONTENT", alarmContent)
         }
 
         val pendingIntent = if (isMoreThanSnow()) {

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

@@ -7,21 +7,24 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import androidx.core.app.NotificationCompat
+import com.stop.LastTimeCheckWorker.Companion.NOTIFICATION_ID
 
 class AlarmReceiver : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
         val alarmCode = intent.extras?.getInt("ALARM_CODE") ?: -1
-        val alarmContent = intent.extras?.getString("ALARM_CONTENT") ?: ""
 
         val soundServiceIntent = Intent(context, SoundService::class.java)
 
         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(ALARM_RECEIVER_CHANNEL_ID) == null) {
-                NotificationChannel(ALARM_RECEIVER_CHANNEL_ID, ALARM_RECEIVER_CHANNEL_NAME, NotificationManager.IMPORTANCE_HIGH).apply {
+            if (notificationManager.getNotificationChannel(id) == null) {
+                NotificationChannel(id, name, NotificationManager.IMPORTANCE_HIGH).apply {
                     notificationManager.createNotificationChannel(this)
                 }
             }
@@ -30,17 +33,20 @@ class AlarmReceiver : BroadcastReceiver() {
                 putExtra("ALARM_CODE", alarmCode)
             }, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
 
-            val builder = NotificationCompat.Builder(context, ALARM_RECEIVER_CHANNEL_ID)
-                .setSmallIcon(R.drawable.ic_baseline_alarm_on_24)
-                .setContentTitle(LAST_TRANSPORT_NOTIFICATION_TITLE)
-                .setContentText(alarmContent)
+            val title = context.getString(R.string.notification_title)
+            val content = context.getString(R.string.alarm_content_text)
+
+            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(ALARM_NOTIFICATION_ID, builder.build())
+                notificationManager.notify(NOTIFICATION_ID, builder.build())
             } catch (e: Exception) {
                 e.printStackTrace()
             }
@@ -54,11 +60,4 @@ class AlarmReceiver : BroadcastReceiver() {
         }
     }
 
-    companion object {
-        const val ALARM_RECEIVER_CHANNEL_ID = "ALARM_RECEIVER_CHANNEL_ID"
-        const val ALARM_RECEIVER_CHANNEL_NAME = "ALARM_RECEIVER_CHANNEL_NAME"
-        const val ALARM_NOTIFICATION_ID = 123
-        private const val LAST_TRANSPORT_NOTIFICATION_TITLE = "막차 알림"
-    }
-
 }

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

@@ -10,6 +10,8 @@ import androidx.work.ForegroundInfo
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
 import com.stop.domain.usecase.nearplace.GetNearPlacesUseCase
+import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_TIME
+import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.LAST_TIME
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.delay
@@ -24,8 +26,14 @@ class LastTimeCheckWorker @AssistedInject constructor(
     private val notificationManager =
         context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-    override suspend fun doWork(): Result {
+    private val lastTime by lazy {
+        inputData.getString(LAST_TIME)
+    }
+    private val alarmTime by lazy {
+        inputData.getInt(ALARM_TIME, 0)
+    }
 
+    override suspend fun doWork(): Result {
         setForeground(createForegroundInfo())
         checkLastTransportTime()
 
@@ -66,14 +74,16 @@ class LastTimeCheckWorker @AssistedInject constructor(
     }
 
     private suspend fun checkLastTransportTime() {
+        //TODO 막차시간 갱신시 알람 삭제 후 등록 로직필요
+
         while (isStopped.not()) {
             getNearPlacesUseCase.getNearPlaces(
                 "아남타워",
                 126.969652,
                 37.553836
             )
 
-            val delayTime = getDelayTime("18:18:00")
+            val delayTime = getDelayTime()
             if (delayTime == 0L) {
                 this.onStopped()
             } else {
@@ -82,8 +92,8 @@ class LastTimeCheckWorker @AssistedInject constructor(
         }
     }
 
-    private fun getDelayTime(lastTime: String): Long {
-        val fullLastTimeMillis = makeFullTime(lastTime).timeInMillis
+    private fun getDelayTime(): Long {
+        val fullLastTimeMillis = makeFullTime(lastTime ?: "").timeInMillis
         val currentTimeMillis = System.currentTimeMillis()
 
         return when (val diffTimeMillis =

presentation/src/main/java/com/stop/di/AlarmModule.kt

@@ -0,0 +1,29 @@
+package com.stop.di
+
+import android.content.Context
+import androidx.work.WorkManager
+import com.stop.AlarmFunctions
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@InstallIn(SingletonComponent::class)
+@Module
+object AlarmModule {
+
+    @Provides
+    @Singleton
+    fun provideWorkManager(
+        @ApplicationContext context: Context
+    ) = WorkManager.getInstance(context)
+
+    @Provides
+    @Singleton
+    fun provideAlarmFunctions(
+        @ApplicationContext context: Context
+    ) = AlarmFunctions(context)
+
+}

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

@@ -1,23 +1,17 @@
 package com.stop.ui.alarmsetting
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.findNavController
-import androidx.work.PeriodicWorkRequestBuilder
-import androidx.work.WorkManager
-import com.stop.AlarmFunctions
-import com.stop.AlarmWorker
 import com.stop.R
 import com.stop.databinding.FragmentAlarmSettingBinding
 import com.stop.domain.model.alarm.AlarmUseCaseItem
 import com.stop.ui.route.ClickRouteViewModel
 import dagger.hilt.android.AndroidEntryPoint
-import java.util.concurrent.TimeUnit
 import kotlin.math.roundToInt
 
 @AndroidEntryPoint
@@ -29,8 +23,6 @@ class AlarmSettingFragment : Fragment() {
     private val alarmSettingViewModel by activityViewModels<AlarmSettingViewModel>()
     private val clickRouteViewModel by activityViewModels<ClickRouteViewModel>()
 
-    private lateinit var alarmFunctions: AlarmFunctions
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -45,7 +37,6 @@ class AlarmSettingFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        alarmFunctions = AlarmFunctions(requireActivity())
         initView()
         setToggleListener()
 
@@ -97,27 +88,12 @@ class AlarmSettingFragment : Fragment() {
             ALARM_CODE,
             true
         )
-        alarmSettingViewModel.saveAlarm(alarmUseCaseItem)
-        makeAlarm()
-        //makeAlarmWorker()
-        binding.root.findNavController().navigate(R.id.action_alarmSetting_to_mapFragment)
-    }
 
-    private fun makeAlarm() {
-        //TODO 알람 바꿔야함
-        alarmFunctions.callAlarm("00:00:05", 4, ALARM_CODE, "막차알림")
-    }
+        alarmSettingViewModel.saveAlarm(alarmUseCaseItem)
+        alarmSettingViewModel.callAlarm(clickRouteViewModel.lastTime)
+        alarmSettingViewModel.makeAlarmWorker(clickRouteViewModel.lastTime)
 
-    private fun makeAlarmWorker() {
-        val periodicWorkRequest = PeriodicWorkRequestBuilder<AlarmWorker>(15, TimeUnit.MINUTES)
-            .build()
-        val workManager = WorkManager.getInstance(requireContext())
-        workManager.enqueue(periodicWorkRequest)
-        workManager.getWorkInfoByIdLiveData(periodicWorkRequest.id)
-            .observe(viewLifecycleOwner) { info ->
-                val outPutData = info.outputData.getString("WORK_RESULT")
-                Log.e("ABC", outPutData.toString())
-            }
+        binding.root.findNavController().navigate(R.id.action_alarmSetting_to_mapFragment)
     }
 
     override fun onDestroyView() {
@@ -127,6 +103,8 @@ class AlarmSettingFragment : Fragment() {
 
     companion object {
         const val ALARM_CODE = 123
+        const val LAST_TIME = "lastTime"
+        const val ALARM_TIME = "alarmTime"
     }
 
 }

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

@@ -3,10 +3,18 @@ package com.stop.ui.alarmsetting
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkManager
+import androidx.work.workDataOf
+import com.stop.AlarmFunctions
+import com.stop.LastTimeCheckWorker
 import com.stop.domain.model.alarm.AlarmUseCaseItem
 import com.stop.domain.usecase.alarm.DeleteAlarmUseCase
 import com.stop.domain.usecase.alarm.GetAlarmUseCase
 import com.stop.domain.usecase.alarm.SaveAlarmUseCase
+import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_CODE
+import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_TIME
+import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.LAST_TIME
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -19,7 +27,9 @@ import javax.inject.Inject
 class AlarmSettingViewModel @Inject constructor(
     private val saveAlarmUseCase: SaveAlarmUseCase,
     private val getAlarmUseCase: GetAlarmUseCase,
-    private val deleteAlarmUseCase: DeleteAlarmUseCase
+    private val deleteAlarmUseCase: DeleteAlarmUseCase,
+    private val alarmFunctions: AlarmFunctions,
+    private val workManager: WorkManager
 ) : ViewModel() {
 
     val alarmTime = MutableLiveData(0)
@@ -47,10 +57,31 @@ class AlarmSettingViewModel @Inject constructor(
         }
     }
 
-    fun deleteAlarm(){
-        viewModelScope.launch(Dispatchers.IO){
+    fun deleteAlarm() {
+        viewModelScope.launch(Dispatchers.IO) {
             deleteAlarmUseCase.deleteAlarm()
         }
     }
 
+    fun callAlarm(time: String) {
+        alarmFunctions.callAlarm(time, alarmTime.value ?: 0, ALARM_CODE)
+    }
+
+    fun cancelAlarm() {
+        alarmFunctions.cancelAlarm(ALARM_CODE)
+    }
+
+    fun makeAlarmWorker(time : String) {
+        val workData = workDataOf(
+            LAST_TIME to time,
+            ALARM_TIME to alarmTime.value
+        )
+
+        val workRequest = OneTimeWorkRequestBuilder<LastTimeCheckWorker>()
+            .setInputData(workData)
+            .build()
+
+        workManager.enqueue(workRequest)
+    }
+
 }

presentation/src/main/res/values/strings.xml

@@ -45,8 +45,9 @@
     <string name="recent_search_text">최근기록</string>
     <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_title">"막차 알림</string>
+    <string name="notification_channel_id">notification_channel_id</string>
+    <string name="notification_channel_name">notification_channel_name</string>
+    <string name="notification_title">막차 알림</string>
     <string name="alarm_cancel_text">취소하기</string>
+    <string name="alarm_content_text">막차를 타러 이제 나가야해요~!!</string>
 </resources>