Merge pull request #104 from boostcampwm-2022/103-mission-issue

[PR] 미션 이슈 해결

Author: jeeminimini

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

@@ -54,15 +54,18 @@ class MissionFragment : Fragment(), MissionHandler {
 
     private lateinit var backPressedCallback: OnBackPressedCallback
 
+    private lateinit var userInfoReceiver: BroadcastReceiver
+    private lateinit var timeReceiver: BroadcastReceiver
+
     var personCurrentLocation = Location(37.553836, 126.969652)
     var firstTime = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setMissionService()
-        setBroadcastReceiver()
-        //setTimeOverBroadcastReceiver()
+        setUserInfoBroadcastReceiver()
+        setTimeOverBroadcastReceiver()
         missionViewModel.missionStatus.value = MissionStatus.ONGOING
     }
 
@@ -103,9 +106,12 @@ class MissionFragment : Fragment(), MissionHandler {
     }
 
     override fun onDestroy() {
-        super.onDestroy()
-
         tMap.onDestroy()
+
+        requireActivity().unregisterReceiver(userInfoReceiver)
+        requireActivity().unregisterReceiver(timeReceiver)
+
+        super.onDestroy()
     }
 
     private fun setMissionService() {
@@ -117,28 +123,28 @@ class MissionFragment : Fragment(), MissionHandler {
         }
     }
 
-    private fun setBroadcastReceiver() {
+    private fun setUserInfoBroadcastReceiver() {
         val intentFilter = IntentFilter().apply {
             addAction(MissionService.MISSION_USER_INFO)
         }
 
-        val receiver = object : BroadcastReceiver() {
+        userInfoReceiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context?, intent: Intent?) {
                 missionViewModel.lastTime.value = intent?.getStringExtra(MISSION_LAST_TIME)
                 missionViewModel.userLocations.value =
                     intent?.getParcelableArrayListExtra<Location>(MISSION_LOCATIONS) as ArrayList<Location>
             }
         }
 
-        requireActivity().registerReceiver(receiver, intentFilter)
+        requireActivity().registerReceiver(userInfoReceiver, intentFilter)
     }
 
     private fun setTimeOverBroadcastReceiver() {
         val intentFilter = IntentFilter().apply {
             addAction(MISSION_TIME_OVER)
         }
 
-        val receiver = object : BroadcastReceiver() {
+        timeReceiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context?, intent: Intent?) {
                 if (intent?.getBooleanExtra(MISSION_TIME_OVER, false) == true) {
                     Snackbar.make(
@@ -151,7 +157,7 @@ class MissionFragment : Fragment(), MissionHandler {
 
             }
         }
-        requireActivity().registerReceiver(receiver, intentFilter)
+        requireActivity().registerReceiver(timeReceiver, intentFilter)
     }
 
     private fun setTimer() {
@@ -161,6 +167,8 @@ class MissionFragment : Fragment(), MissionHandler {
         } else {
             requireActivity().startService(missionServiceIntent)
         }
+
+        missionServiceIntent.removeExtra(MISSION_LAST_TIME)
     }
 
     private fun setDataBinding() {
@@ -338,7 +346,7 @@ class MissionFragment : Fragment(), MissionHandler {
     }
 
     private fun setSuccessAnimation() {
-        with (binding.lottieSuccess) {
+        with(binding.lottieSuccess) {
             playAnimation()
             addAnimatorListener(object : Animator.AnimatorListener {
                 override fun onAnimationStart(animation: Animator) {
@@ -358,7 +366,7 @@ class MissionFragment : Fragment(), MissionHandler {
     }
 
     private fun setFailAnimation() {
-        with (binding.lottieFail) {
+        with(binding.lottieFail) {
             visibility = View.VISIBLE
             playAnimation()
             addAnimatorListener(object : Animator.AnimatorListener {

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

@@ -140,19 +140,19 @@ class MissionService : LifecycleService() {
 
     private fun getTimer(intent: Intent?) {
         val lastTimeString = intent?.getStringExtra(MISSION_LAST_TIME)
-        val lastTimeMillis = makeFullTime(lastTimeString ?: "").timeInMillis
-        val nowTimeMillis = System.currentTimeMillis()
-        var diffTimeMillis = if (lastTimeMillis > nowTimeMillis) lastTimeMillis - nowTimeMillis else 0L
-
-        timer.cancel()
-        timer = lifecycleScope.launch(Dispatchers.IO) {
-            while (diffTimeMillis > 0L) {
-                lastTime = convertTimeMillisToString(diffTimeMillis)
-                sendUserInfo()
-                diffTimeMillis -= 1_000L
-                delay(1_000L)
-            }
-            if (diffTimeMillis == 0L) {
+        if (lastTimeString != null) {
+            val lastTimeMillis = makeFullTime(lastTimeString).timeInMillis
+            val nowTimeMillis = System.currentTimeMillis()
+            var diffTimeMillis = if (lastTimeMillis > nowTimeMillis) lastTimeMillis - nowTimeMillis else 0L
+
+            timer.cancel()
+            timer = lifecycleScope.launch(Dispatchers.IO) {
+                while (diffTimeMillis > -1_000L) {
+                    lastTime = convertTimeMillisToString(diffTimeMillis)
+                    sendUserInfo()
+                    diffTimeMillis -= 1_000L
+                    delay(1_000L)
+                }
                 sendMissionOver()
             }
         }

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

@@ -1,7 +1,6 @@
 package com.stop.ui.mission
 
 import android.content.Context
-import android.graphics.Color
 import androidx.core.content.ContextCompat
 import com.skt.tmap.TMapPoint
 import com.skt.tmap.overlay.TMapPolyLine
@@ -17,9 +16,7 @@ class MissionTMap(
         val points = arrayListOf(nowLocation, beforeLocation)
         val polyLine = TMapPolyLine(id, points).apply {
             lineColor = ContextCompat.getColor(context, color)
-            lineWidth = LINE_WIDTH
-            outLineColor = Color.WHITE
-            outLineWidth = OUT_LINE_WIDTH
+            outLineColor = ContextCompat.getColor(context, color)
         }
 
         tMapView.addTMapPolyLine(polyLine)
@@ -42,9 +39,4 @@ class MissionTMap(
             }
         }
     }
-
-    companion object {
-        private const val LINE_WIDTH = 7F
-        private const val OUT_LINE_WIDTH = 10F
-    }
 }