feat : 출도착지 UI 연결 및 Worker 주석처리

Author: koreatlwls

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

@@ -40,8 +40,6 @@ class AlarmSettingFragment : Fragment() {
 
         initView()
         setToggleListener()
-
-        // TODO 뷰모델 가져와서 경로 막차시간 등 연결 작업해야함
     }
 
     private fun initBinding() {
@@ -57,8 +55,8 @@ class AlarmSettingFragment : Fragment() {
         binding.apply {
             lifecycleOwner = viewLifecycleOwner
             alarmViewModel = alarmSettingViewModel
-            startPosition = itinerary.routes.first().start.name
-            endPosition = itinerary.routes.last().end.name
+            startPosition = routeResultViewModel.origin.value?.name
+            endPosition = routeResultViewModel.destination.value?.name
             lastTime = transportLastTime.timeToBoard
             walkTime = (itinerary.routes.first().sectionTime.div(60)).roundToInt()
             fragment = this@AlarmSettingFragment
@@ -98,8 +96,8 @@ class AlarmSettingFragment : Fragment() {
         }.first()
 
         val alarmUseCaseItem = AlarmUseCaseItem(
-            startPosition = itinerary.routes.first().start.name,
-            endPosition = itinerary.routes.last().end.name,
+            startPosition = routeResultViewModel.origin.value?.name ?: "",
+            endPosition = routeResultViewModel.destination.value?.name ?: "",
             routes = itinerary.routes,
             lastTime = transportLastTime.timeToBoard,
             walkTime = (itinerary.routes.first().sectionTime.div(60)).roundToInt(),
@@ -110,7 +108,7 @@ class AlarmSettingFragment : Fragment() {
 
         alarmSettingViewModel.saveAlarm(alarmUseCaseItem)
         alarmSettingViewModel.callAlarm(transportLastTime.timeToBoard)
-        alarmSettingViewModel.makeAlarmWorker(transportLastTime.timeToBoard)
+        //alarmSettingViewModel.makeAlarmWorker(transportLastTime.timeToBoard)
 
         val navController = findNavController()
         navController.setGraph(R.navigation.nav_graph)

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

@@ -42,7 +42,7 @@ class AlarmSettingViewModel @Inject constructor(
     private val _isAlarmItemNotNull = MutableStateFlow(false)
     val isAlarmItemNotNull: StateFlow<Boolean> = _isAlarmItemNotNull
 
-    private lateinit var workerId : UUID
+    private lateinit var workerId: UUID
 
     fun saveAlarm(alarmUseCaseItem: AlarmUseCaseItem) {
         viewModelScope.launch(Dispatchers.IO) {
@@ -64,17 +64,18 @@ class AlarmSettingViewModel @Inject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             deleteAlarmUseCase.deleteAlarm()
         }
+        cancelAlarm()
     }
 
     fun callAlarm(time: String) {
         alarmFunctions.callAlarm(time, alarmTime.value ?: 0, ALARM_CODE)
     }
 
-    fun cancelAlarm() {
+    private fun cancelAlarm() {
         alarmFunctions.cancelAlarm(ALARM_CODE)
     }
 
-    fun makeAlarmWorker(time : String) {
+    fun makeAlarmWorker(time: String) {
         val workData = workDataOf(
             LAST_TIME to time,
             ALARM_TIME to alarmTime.value
@@ -88,7 +89,7 @@ class AlarmSettingViewModel @Inject constructor(
         workManager.enqueue(workRequest)
     }
 
-    fun removeAlarmWorker(){
+    fun removeAlarmWorker() {
         workManager.cancelWorkById(workerId)
     }
 

presentation/src/main/java/com/stop/ui/alarmstart/AlarmStartFragment.kt

@@ -54,15 +54,15 @@ class AlarmStartFragment : Fragment() {
             buttonAlarmTurnOff.setOnClickListener {
                 turnOffSoundService()
                 alarmSettingViewModel.deleteAlarm()
-                alarmSettingViewModel.removeAlarmWorker()
+                //alarmSettingViewModel.removeAlarmWorker()
                 requireActivity().finish()
             }
 
             textViewMissionStart.setOnClickListener {
                 turnOffSoundService()
                 root.findNavController().navigate(R.id.action_alarmStartFragment_to_missionFragment)
                 alarmSettingViewModel.deleteAlarm()
-                alarmSettingViewModel.removeAlarmWorker()
+                //alarmSettingViewModel.removeAlarmWorker()
             }
         }
     }