feat : 미션 종료 버튼 클릭시 workmanager 종료

Author: jeeminimini

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

@@ -34,8 +34,6 @@ class MissionFragment : Fragment(), MissionHandler {
 
     private lateinit var tMap: MissionTMap
 
-    private var state = State.FOREGROUND
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -57,19 +55,6 @@ class MissionFragment : Fragment(), MissionHandler {
 
     }
 
-    override fun onResume() {
-        super.onResume()
-        Log.d("MissionWorker", "onResume")
-
-        state = State.FOREGROUND
-    }
-
-    override fun onStop() {
-        super.onStop()
-        Log.d("MissionWorker", "onStop")
-        state = State.BACKGROUND
-    }
-
     override fun onDestroyView() {
         _binding = null
 
@@ -182,24 +167,38 @@ class MissionFragment : Fragment(), MissionHandler {
         lateinit var beforeLocation: Location
         lifecycleScope.launch {
             viewModel.userLocation.collect { userLocation ->
-                if (first < 2) {
-                    beforeLocation = userLocation
-                    first += 1
-                } else {
-                    val nowLocation = TMapPoint(userLocation.latitude, userLocation.longitude)
-                    tMap.drawMoveLine(
-                        nowLocation,
-                        TMapPoint(beforeLocation.latitude, beforeLocation.longitude),
-                        Marker.PERSON_LINE + PERSON_LINE_NUM.toString(),
-                        Marker.PERSON_LINE_COLOR
-                    )
-                    tMap.addMarker(Marker.PERSON_MARKER, Marker.PERSON_MARKER_IMG, nowLocation)
-                    viewModel.personCurrentLocation = userLocation
-                    if (tMap.isTracking) {
+                when (first) {
+                    0 -> {
+                        first += 1
+                    }
+                    1 -> {
+                        beforeLocation = userLocation
                         tMap.tMapView.setCenterPoint(userLocation.latitude, userLocation.longitude)
+                        tMap.addMarker(
+                            Marker.PERSON_MARKER,
+                            Marker.PERSON_MARKER_IMG,
+                            TMapPoint(userLocation.latitude, userLocation.longitude)
+                        )
+                        viewModel.personCurrentLocation = userLocation
+                        first += 1
+                    }
+                    else -> {
+                        Log.d("MissionWorker", "그리는 중 $userLocation $beforeLocation")
+                        val nowLocation = TMapPoint(userLocation.latitude, userLocation.longitude)
+                        tMap.drawMoveLine(
+                            nowLocation,
+                            TMapPoint(beforeLocation.latitude, beforeLocation.longitude),
+                            Marker.PERSON_LINE + PERSON_LINE_NUM.toString(),
+                            Marker.PERSON_LINE_COLOR
+                        )
+                        tMap.addMarker(Marker.PERSON_MARKER, Marker.PERSON_MARKER_IMG, nowLocation)
+                        viewModel.personCurrentLocation = userLocation
+                        if (tMap.isTracking) {
+                            tMap.tMapView.setCenterPoint(userLocation.latitude, userLocation.longitude)
+                        }
+                        beforeLocation = userLocation
+                        PERSON_LINE_NUM += 1
                     }
-                    beforeLocation = userLocation
-                    PERSON_LINE_NUM += 1
                 }
 
             }

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

@@ -1,5 +1,6 @@
 package com.stop.ui.mission
 
+import android.util.Log
 import androidx.lifecycle.*
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
@@ -9,13 +10,14 @@ import com.stop.model.Location
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import java.util.UUID
 import javax.inject.Inject
 import kotlin.random.Random
 
 @HiltViewModel
 class MissionViewModel @Inject constructor(
     private val workManager: WorkManager,
-    private val missionManager: MissionManager
+    missionManager: MissionManager
 ) : ViewModel() {
 
     private val random = Random(System.currentTimeMillis())
@@ -56,6 +58,8 @@ class MissionViewModel @Inject constructor(
 
     val userLocation = missionManager.userLocation
 
+    lateinit var requestId: UUID
+
     init {
         makeMissionWorker()
     }
@@ -101,9 +105,16 @@ class MissionViewModel @Inject constructor(
         val workRequest = OneTimeWorkRequestBuilder<MissionWorker>()
             .build()
 
+        requestId = workRequest.id
+
         workManager.enqueue(workRequest)
     }
 
+    fun cancelMission() {
+        Log.d("MissionWorker","취소 되나연")
+        workManager.cancelWorkById(requestId)
+    }
+
     companion object {
         private const val DELAY_TIME = 1000L
         private const val TIME_ZERO = 0

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

@@ -57,18 +57,6 @@ class MissionWorker @AssistedInject constructor(
         ) {
             return
         }
-        fusedLocationClient.lastLocation
-            .addOnSuccessListener { location ->
-                if (location == null) {
-                    Log.d("MissionWorker", "location get fail")
-                } else {
-                    Log.d("MissionWorker", "initLocation(last) ${location.latitude} , ${location.longitude}")
-                }
-            }
-            .addOnFailureListener {
-                Log.d("MissionWorker", "location error is ${it.message}")
-                it.printStackTrace()
-            }
 
         locationCallback = object : LocationCallback() {
             override fun onLocationResult(locationResult: LocationResult) {

presentation/src/main/res/layout/fragment_mission.xml

@@ -109,7 +109,8 @@
             android:background="@drawable/background_close_button"
             app:layout_constraintBottom_toBottomOf="@id/guideline_bottom"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+            app:layout_constraintStart_toStartOf="parent"
+            android:onClick="@{() -> viewModel.cancelMission()}">
 
             <ImageView
                 android:id="@+id/image_view_mission_close"