feat : 미션 종료 구현 - 정류장 도착시 & x 버튼 클릭시

- Snack bar 수정

Author: jeeminimini

presentation/src/main/java/com/stop/ui/mission/MissionFragment.kt

@@ -4,7 +4,6 @@ import android.Manifest
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -23,6 +22,7 @@ import com.stop.model.Location
 import com.stop.ui.alarmsetting.AlarmSettingViewModel
 import com.stop.ui.util.Marker
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
@@ -112,7 +112,7 @@ class MissionFragment : Fragment(), MissionHandler {
     }
 
     fun clickMissionOver() {
-        Snackbar.make(requireActivity().findViewById(com.airbnb.lottie.R.id.content), "미션을 취소합니다", Snackbar.LENGTH_SHORT).show()
+        Snackbar.make(requireActivity().findViewById(R.id.constraint_layout_container), "미션을 취소합니다", Snackbar.LENGTH_SHORT).show()
         missionViewModel.isMissionOver.value = true
     }
 
@@ -202,7 +202,8 @@ class MissionFragment : Fragment(), MissionHandler {
             addMarker(
                 Marker.PERSON_MARKER,
                 Marker.PERSON_MARKER_IMG,
-                TMapPoint(nowLocation.latitude, nowLocation.longitude)
+                TMapPoint(nowLocation.latitude, nowLocation.longitude),
+                true
             )
             personCurrentLocation = nowLocation
             latitudes.add(nowLocation.latitude)
@@ -256,15 +257,17 @@ class MissionFragment : Fragment(), MissionHandler {
             ) <= 10
         ) {
             missionViewModel.isMissionOver.value = true
-            Snackbar.make(requireActivity().findViewById(com.airbnb.lottie.R.id.content), "정류장에 도착했습니다!", Snackbar.LENGTH_SHORT).show()
+            Snackbar.make(requireActivity().findViewById(R.id.constraint_layout_container), "정류장에 도착했습니다!", Snackbar.LENGTH_SHORT).show()
         }
     }
 
     private fun setMissionOver() {
-        missionViewModel.isMissionOver.observe(viewLifecycleOwner) { isMissionOver ->
-            if (isMissionOver) {
-                missionViewModel.cancelMission()
-                alarmSettingViewModel.deleteAlarm()
+        lifecycleScope.launch {
+            missionViewModel.isMissionOver.collectLatest { isMissionOver ->
+                if (isMissionOver) {
+                    missionViewModel.cancelMission()
+                    alarmSettingViewModel.deleteAlarm()
+                }
             }
         }
     }

presentation/src/main/java/com/stop/ui/mission/MissionManager.kt

@@ -7,4 +7,6 @@ class MissionManager {
 
     var userLocation = MutableStateFlow(Location(0.0, 0.0))
 
+    var isMissionOver = MutableStateFlow(false)
+
 }

presentation/src/main/java/com/stop/ui/mission/MissionViewModel.kt

@@ -6,11 +6,9 @@ import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import com.stop.domain.model.route.tmap.custom.Coordinate
 import com.stop.domain.model.route.tmap.custom.Place
-import com.stop.model.Location
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import java.util.*
 import javax.inject.Inject
@@ -34,8 +32,6 @@ class MissionViewModel @Inject constructor(
     val estimatedTimeRemaining: LiveData<Int>
         get() = _estimatedTimeRemaining
 
-    val isMissionOver = MutableLiveData(false)
-
     val leftMinute: LiveData<String> = Transformations.switchMap(estimatedTimeRemaining) {
         MutableLiveData<String>().apply {
             value = (it / TIME_UNIT).toString().padStart(TIME_DIGIT, '0')
@@ -49,6 +45,7 @@ class MissionViewModel @Inject constructor(
     }
 
     val userLocation = missionManager.userLocation
+    val isMissionOver = missionManager.isMissionOver
 
     lateinit var requestId: UUID
 

presentation/src/main/java/com/stop/ui/mission/MissionWorker.kt

@@ -16,7 +16,6 @@ import androidx.core.app.NotificationCompat
 import androidx.hilt.work.HiltWorker
 import androidx.work.CoroutineWorker
 import androidx.work.ForegroundInfo
-import androidx.work.WorkManager
 import androidx.work.WorkerParameters
 import com.google.android.gms.location.*
 import com.stop.MainActivity
@@ -44,7 +43,9 @@ class MissionWorker @AssistedInject constructor(
     override suspend fun doWork(): Result {
         setForeground(createForegroundInfo())
         getPersonLocation()
-        test()
+        while (missionManager.isMissionOver.value.not()) {
+            delay(INTERVAL_UNIT)
+        }
         fusedLocationClient.removeLocationUpdates(locationCallback)
         return Result.success()
     }
@@ -73,14 +74,6 @@ class MissionWorker @AssistedInject constructor(
         fusedLocationClient.requestLocationUpdates(locationRequest, locationCallback, Looper.getMainLooper())
     }
 
-    private suspend fun test() {
-        while (NUM < 60) {
-            Log.d("MissionWorker", "찍히나 테스트 ${NUM}")
-            NUM += 1
-            delay(5000)
-        }
-    }
-
     private fun createForegroundInfo(): ForegroundInfo {
         val id = applicationContext.getString(R.string.mission_notification_channel_id)
         val title = applicationContext.getString(R.string.mission_notification_title)

presentation/src/main/java/com/stop/ui/util/TMap.kt

@@ -1,6 +1,7 @@
 package com.stop.ui.util
 
 import android.content.Context
+import android.util.Log
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
 import com.skt.tmap.TMapGpsManager
@@ -12,7 +13,6 @@ import com.stop.model.Location
 import com.stop.ui.map.MapHandler
 import com.stop.ui.mission.MissionHandler
 import com.stop.ui.routedetail.RouteDetailHandler
-import kotlin.math.round
 
 open class TMap(
     private val context: Context,
@@ -98,6 +98,7 @@ open class TMap(
         if (isFirst.not()) {
             tMapView.removeTMapMarkerItem(id)
         }
+        Log.d("MissionWorker","왜 마커가 null이라고 하는거임 $marker")
         tMapView.addTMapMarkerItem(marker)
     }