feat : 임의의 버스 현재 위치 그리기 구현

Author: jeeminimini

data/src/main/java/com/stop/data/model/nowlocation/BusInfoRepositoryItem.kt

@@ -14,8 +14,8 @@ data class BusInfoRepositoryItem(
     fun toUseCaseModel() = BusInfoUseCaseItem(
         isArrivedAtStation,
         sectionId,
-        latitude,
-        longitude,
+        latitude.toDouble(),
+        longitude.toDouble(),
         busId,
         busNumber,
         isRun,

data/src/main/java/com/stop/data/remote/model/nowlocation/BusInfo.kt

@@ -8,9 +8,9 @@ data class BusInfo(
     val isArrivedAtStation: String,
     val sectionId: String,
     @Json(name = "gpsX")
-    val latitude: String,
-    @Json(name = "gpsY")
     val longitude: String,
+    @Json(name = "gpsY")
+    val latitude: String,
     @Json(name = "vehId")
     val busId: String,
     @Json(name = "plainNo")

domain/src/main/java/com/stop/domain/model/nowlocation/BusInfoUseCaseItem.kt

@@ -3,8 +3,8 @@ package com.stop.domain.model.nowlocation
 data class BusInfoUseCaseItem(
     val isArrivedAtStation: String,
     val sectionId: String,
-    val latitude: String,
-    val longitude: String,
+    val latitude: Double,
+    val longitude: Double,
     val busId: String,
     val busNumber: String,
     val isRun: String,

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

@@ -5,6 +5,7 @@ import android.animation.AnimatorListenerAdapter
 import android.content.ContextWrapper
 import android.graphics.Color
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,6 +14,7 @@ import androidx.fragment.app.viewModels
 import com.skt.tmap.TMapPoint
 import com.stop.R
 import com.stop.databinding.FragmentMissionBinding
+import com.stop.model.Location
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -26,6 +28,8 @@ class MissionFragment : Fragment(), MissionHandler {
 
     private lateinit var tMap: MissionTMap
 
+    private var beforeLocation = INIT_LOCATION
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -124,9 +128,31 @@ class MissionFragment : Fragment(), MissionHandler {
         }
     }
 
+    private fun drawBusLocationLine() {
+        viewModel.busNowLocationInfo.observe(viewLifecycleOwner) { nowLocation ->
+            if (Location(nowLocation.latitude, nowLocation.longitude) != INIT_LOCATION) {
+                tMap.drawMoveLine(
+                    TMapPoint(nowLocation.latitude, nowLocation.longitude),
+                    TMapPoint(beforeLocation.latitude, beforeLocation.longitude),
+                    BUS_LINE + BUS_LINE_NUM.toString(),
+                    BUS_LINE_COLOR
+                )
+                BUS_LINE_NUM += 1
+            }
+            beforeLocation = Location(nowLocation.latitude, nowLocation.longitude)
+
+            tMap.makeMarker(
+                BUS_MARKER,
+                BUS_MARKER_IMG,
+                TMapPoint(nowLocation.latitude, nowLocation.longitude)
+            )
+        }
+    }
+
     override fun alertTMapReady() {
         //mimicUserMove()
         tMap.setTrackingMode()
+        drawBusLocationLine()
     }
 
     override fun setOnLocationChangeListener(nowLocation: TMapPoint, beforeLocation: TMapPoint) {
@@ -158,5 +184,10 @@ class MissionFragment : Fragment(), MissionHandler {
         private const val BUS_LINE = "bus_line"
         private const val BUS_LINE_COLOR = Color.BLUE
         private var BUS_LINE_NUM = 0
+
+        private val INIT_LOCATION = Location(0.0, 0.0)
+
+        private const val BUS_MARKER = "marker_bus_pin"
+        private const val BUS_MARKER_IMG = R.drawable.ic_baseline_directions_bus_32
     }
 }

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

@@ -88,7 +88,7 @@ class MissionViewModel @Inject constructor(
     private fun getBusNowLocation() {
         viewModelScope.launch {
             while (TIME_TEST < 60) {
-                _busNowLocationInfo.value = getBusNowLocationUseCase.getBusNowLocation(BUS_441_ID)
+                _busNowLocationInfo.value = getBusNowLocationUseCase.getBusNowLocation(BUS_540_ID)
                 Log.d("MissionViewModel","busNowLocationInfo ${_busNowLocationInfo.value}")
                 delay(1000)
                 TIME_TEST += 1
@@ -106,7 +106,7 @@ class MissionViewModel @Inject constructor(
         private const val RANDOM_LIMIT = 5
         private const val ZERO = 0
 
-        private const val BUS_441_ID = "100100083"
+        private const val BUS_540_ID = "100100083"
         private var TIME_TEST = 0
     }
 }

presentation/src/main/res/drawable/ic_baseline_directions_bus_32.xml

@@ -0,0 +1,5 @@
+<vector android:height="32dp" android:tint="#6B2EC9"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M4,16c0,0.88 0.39,1.67 1,2.22L5,20c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h8v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1.78c0.61,-0.55 1,-1.34 1,-2.22L20,6c0,-3.5 -3.58,-4 -8,-4s-8,0.5 -8,4v10zM7.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5S6.67,14 7.5,14s1.5,0.67 1.5,1.5S8.33,17 7.5,17zM16.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM18,11L6,11L6,6h12v5z"/>
+</vector>