feat : MissionMap에서 person 현재 위치와 bus 현재 위치로 갈 수 있는 버튼 구현

- person은 TrackingMode 존재, bus는 TrackingMode 존재 안함. 그냥 버스의 현재위치로만 감.

Author: jeeminimini

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

@@ -15,6 +15,7 @@ import com.skt.tmap.TMapPoint
 import com.stop.R
 import com.stop.databinding.FragmentMissionBinding
 import com.stop.model.Location
+import com.stop.ui.map.MapFragment
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -45,6 +46,7 @@ class MissionFragment : Fragment(), MissionHandler {
         setDataBinding()
         initViewModel()
         initTMap()
+        initView()
         setObserve()
     }
 
@@ -96,6 +98,33 @@ class MissionFragment : Fragment(), MissionHandler {
         viewModel.countDownWith(LEFT_TIME)
     }
 
+    private fun initView() {
+        binding.imageViewCompassMode.setOnClickListener {
+            tMap.tMapView.isCompassMode = tMap.tMapView.isCompassMode.not()
+        }
+
+        binding.imageViewPersonCurrentLocation.setOnClickListener {
+            tMap.tMapView.setCenterPoint(
+                viewModel.personCurrentLocation.latitude,
+                viewModel.personCurrentLocation.longitude,
+                true
+            )
+
+            tMap.isTracking = true
+        }
+
+        binding.imageViewBusCurrentLocation.setOnClickListener {
+            tMap.tMapView.setCenterPoint(
+                viewModel.busCurrentLocation.latitude,
+                viewModel.busCurrentLocation.longitude,
+                true
+            )
+
+            tMap.isTracking = false
+        }
+
+    }
+
     private fun setObserve() {
         val shortAnimationDuration =
             resources.getInteger(android.R.integer.config_shortAnimTime)
@@ -130,7 +159,7 @@ class MissionFragment : Fragment(), MissionHandler {
 
     private fun drawBusLocationLine() {
         viewModel.busNowLocationInfo.observe(viewLifecycleOwner) { nowLocation ->
-            if (Location(nowLocation.latitude, nowLocation.longitude) != INIT_LOCATION) {
+            if (beforeLocation != INIT_LOCATION) {
                 tMap.drawMoveLine(
                     TMapPoint(nowLocation.latitude, nowLocation.longitude),
                     TMapPoint(beforeLocation.latitude, beforeLocation.longitude),
@@ -141,6 +170,8 @@ class MissionFragment : Fragment(), MissionHandler {
             }
             beforeLocation = Location(nowLocation.latitude, nowLocation.longitude)
 
+            viewModel.busCurrentLocation = beforeLocation
+
             tMap.makeMarker(
                 BUS_MARKER,
                 BUS_MARKER_IMG,
@@ -163,6 +194,8 @@ class MissionFragment : Fragment(), MissionHandler {
             PERSON_LINE_COLOR
         )
         PERSON_LINE_NUM += 1
+
+        viewModel.personCurrentLocation = Location(nowLocation.latitude, nowLocation.longitude)
     }
 
     override fun setOnEnableScrollWithZoomLevelListener() {
@@ -175,6 +208,7 @@ class MissionFragment : Fragment(), MissionHandler {
     }
 
     companion object {
+
         private const val DESTINATION = "구로3동현대아파트"
         private const val PLUS = "+"
         private const val MINUS = ""
@@ -194,5 +228,6 @@ class MissionFragment : Fragment(), MissionHandler {
 
         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

@@ -4,6 +4,7 @@ import android.util.Log
 import androidx.lifecycle.*
 import com.stop.domain.model.nowlocation.BusInfoUseCaseItem
 import com.stop.domain.usecase.nowlocation.GetBusNowLocationUseCase
+import com.stop.model.Location
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -44,6 +45,9 @@ class MissionViewModel @Inject constructor(
     private val _busNowLocationInfo = MutableLiveData<BusInfoUseCaseItem>()
     val busNowLocationInfo: LiveData<BusInfoUseCaseItem> = _busNowLocationInfo
 
+    var personCurrentLocation = Location(0.0, 0.0)
+    var busCurrentLocation = Location(0.0, 0.0)
+
     init {
         getBusNowLocation()
     }
@@ -90,7 +94,7 @@ class MissionViewModel @Inject constructor(
             while (TIME_TEST < 60) {
                 _busNowLocationInfo.value = getBusNowLocationUseCase.getBusNowLocation(BUS_540_ID)
                 Log.d("MissionViewModel","busNowLocationInfo ${_busNowLocationInfo.value}")
-                delay(1000)
+                delay(5000)
                 TIME_TEST += 1
             }
 

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

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="50dp"
+    android:height="50dp"
+    android:tint="#FF5555"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <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>

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

@@ -81,18 +81,27 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="15dp"
-            app:layout_constraintBottom_toTopOf="@id/image_view_current_location"
+            app:layout_constraintBottom_toTopOf="@id/image_view_person_current_location"
             app:layout_constraintEnd_toEndOf="@id/guideline_end"
             app:srcCompat="@drawable/ic_compass" />
 
         <ImageView
-            android:id="@+id/image_view_current_location"
+            android:id="@+id/image_view_person_current_location"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="15dp"
+            app:layout_constraintBottom_toTopOf="@id/image_view_bus_current_location"
+            app:layout_constraintEnd_toEndOf="@id/guideline_end"
+            app:srcCompat="@drawable/ic_location" />
+
+        <ImageView
+            android:id="@+id/image_view_bus_current_location"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="30dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@id/guideline_end"
-            app:srcCompat="@drawable/ic_location" />
+            app:srcCompat="@drawable/ic_baseline_directions_bus_big" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>