Merge remote-tracking branch 'origin/develop' into 71-feature-mission-background

# Conflicts:
#	presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingViewModel.kt
#	presentation/src/main/java/com/stop/ui/mission/MissionFragment.kt

Author: jeeminimini

presentation/src/main/java/com/stop/ui/map/MapFragment.kt

@@ -253,7 +253,7 @@ class MapFragment : Fragment(), MapHandler {
 
     fun setMissionStart() {
         Log.d("MissionWorker","mission 버튼 클릭")
-        binding.root.findNavController().navigate(R.id.action_mapFragment_to_missionFragment)
+       findNavController().navigate(R.id.action_mapFragment_to_missionFragment)
     }
 
     companion object {

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

@@ -179,44 +179,49 @@ class MissionFragment : Fragment(), MissionHandler {
                         first += 1
                     }
                     1 -> {
+                        initMarker(userLocation)
                         beforeLocation = userLocation
-                        tMap.addMarker(
-                            Marker.PERSON_MARKER,
-                            Marker.PERSON_MARKER_IMG,
-                            TMapPoint(userLocation.latitude, userLocation.longitude),
-                            true
-                        )
-                        personCurrentLocation = userLocation
-                        tMap.latitudes.add(userLocation.latitude)
-                        tMap.longitudes.add(userLocation.longitude)
-                        tMap.setRouteDetailFocus()
                         first += 1
-                        arriveDestination(userLocation.latitude, userLocation.longitude)
                     }
                     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)
-                        personCurrentLocation = userLocation
+                        drawNowLocationLine(TMapPoint(userLocation.latitude, userLocation.longitude), TMapPoint(beforeLocation.latitude, beforeLocation.longitude))
+                        missionViewModel.personCurrentLocation = userLocation
                         if (tMap.isTracking) {
                             tMap.tMapView.setCenterPoint(userLocation.latitude, userLocation.longitude)
                         }
                         beforeLocation = userLocation
-                        PERSON_LINE_NUM += 1
-                        arriveDestination(userLocation.latitude, userLocation.longitude)
                     }
                 }
-
             }
         }
     }
 
+    private fun initMarker(nowLocation: Location) {
+        with(tMap) {
+            addMarker(
+                Marker.PERSON_MARKER,
+                Marker.PERSON_MARKER_IMG,
+                TMapPoint(nowLocation.latitude, nowLocation.longitude)
+            )
+            missionViewModel.personCurrentLocation = nowLocation
+            latitudes.add(nowLocation.latitude)
+            longitudes.add(nowLocation.longitude)
+            setRouteDetailFocus()
+        }
+    }
+
+    private fun drawNowLocationLine(nowLocation: TMapPoint, beforeLocation: TMapPoint) {
+        tMap.drawMoveLine(
+            nowLocation,
+            beforeLocation,
+            Marker.PERSON_LINE + PERSON_LINE_NUM.toString(),
+            Marker.PERSON_LINE_COLOR
+        )
+        PERSON_LINE_NUM += 1
+
+        tMap.addMarker(Marker.PERSON_MARKER, Marker.PERSON_MARKER_IMG, nowLocation)
+    }
+
     private fun getAlarmInfo() {
         alarmSettingViewModel.getAlarm()
         val linePoints = arrayListOf<TMapPoint>()