feat : 사용자가 이동할 walk 경로 그리기 & 도착지 마커 및 안내 패널 생성

Author: jeeminimini

presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingViewModel.kt

@@ -1,5 +1,6 @@
 package com.stop.ui.alarmsetting
 
+import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -21,7 +22,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import java.util.UUID
+import java.util.*
 import javax.inject.Inject
 
 @HiltViewModel
@@ -54,7 +55,7 @@ class AlarmSettingViewModel @Inject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             getAlarmUseCase.getAlarm().collectLatest {
                 _alarmItem.value = it
-
+                Log.d("MissonWorker","alarm viewModel에서 가져오나? ${_alarmItem.value}  ${_alarmItem.value?.routes}")
                 _isAlarmItemNotNull.value = it != null
             }
         }
@@ -67,7 +68,7 @@ class AlarmSettingViewModel @Inject constructor(
     }
 
     fun callAlarm(time: String) {
-        alarmFunctions.callAlarm(time, alarmTime.value ?: 0, ALARM_CODE)
+        alarmFunctions.callAlarm("01:00:00", alarmTime.value ?: 0, ALARM_CODE)
     }
 
     fun cancelAlarm() {

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

@@ -1,7 +1,9 @@
 package com.stop.ui.map
 
 import android.Manifest.permission
+import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,6 +19,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.skt.tmap.TMapPoint
 import com.stop.R
 import com.stop.RouteNavGraphDirections
+import com.stop.SoundService
 import com.stop.databinding.FragmentMapBinding
 import com.stop.model.Location
 import com.stop.ui.alarmsetting.AlarmSettingViewModel
@@ -68,6 +71,7 @@ class MapFragment : Fragment(), MapHandler {
         binding.lifecycleOwner = viewLifecycleOwner
         binding.alarmViewModel = alarmViewModel
         binding.placeSearchViewModel = placeSearchViewModel
+        binding.fragment = this@MapFragment
     }
 
     private fun initTMap() {
@@ -222,11 +226,17 @@ class MapFragment : Fragment(), MapHandler {
     private fun listenButtonClick(){
         binding.homeBottomSheet.layoutStateExpanded.buttonAlarmTurnOff.setOnClickListener {
             alarmViewModel.deleteAlarm()
+            turnOffSoundService()
             val behavior = BottomSheetBehavior.from(binding.layoutHomeBottomSheet)
             behavior.state = BottomSheetBehavior.STATE_COLLAPSED
         }
     }
 
+    private fun turnOffSoundService() {
+        val intent = Intent(context, SoundService::class.java)
+        requireContext().stopService(intent)
+    }
+
     override fun onDestroyView() {
         _binding = null
 
@@ -241,6 +251,11 @@ class MapFragment : Fragment(), MapHandler {
         }
     }
 
+    fun setMissionStart() {
+        Log.d("MissionWorker","mission 버튼 클릭")
+        binding.root.findNavController().navigate(R.id.action_mapFragment_to_missionFragment)
+    }
+
     companion object {
         private val PERMISSIONS =
             arrayOf(permission.ACCESS_FINE_LOCATION, permission.ACCESS_COARSE_LOCATION)

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

@@ -8,15 +8,18 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import com.skt.tmap.TMapPoint
 import com.stop.R
 import com.stop.databinding.FragmentMissionBinding
+import com.stop.domain.model.route.tmap.custom.Place
+import com.stop.domain.model.route.tmap.custom.WalkRoute
 import com.stop.model.Location
+import com.stop.ui.alarmsetting.AlarmSettingViewModel
 import com.stop.ui.util.Marker
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
@@ -28,7 +31,8 @@ class MissionFragment : Fragment(), MissionHandler {
     private val binding: FragmentMissionBinding
         get() = _binding!!
 
-    private val viewModel: MissionViewModel by viewModels()
+    private val missionViewModel: MissionViewModel by viewModels()
+    private val alarmSettingViewModel: AlarmSettingViewModel by activityViewModels<AlarmSettingViewModel>()
 
     private lateinit var tMap: MissionTMap
 
@@ -60,7 +64,7 @@ class MissionFragment : Fragment(), MissionHandler {
 
     private fun setDataBinding() {
         binding.lifecycleOwner = viewLifecycleOwner
-        binding.viewModel = viewModel
+        binding.viewModel = missionViewModel
         binding.fragment = this@MissionFragment
     }
 
@@ -72,8 +76,7 @@ class MissionFragment : Fragment(), MissionHandler {
     }
 
     private fun initViewModel() {
-        viewModel.setDestination(DESTINATION)
-        viewModel.countDownWith(LEFT_TIME)
+        missionViewModel.countDownWith(LEFT_TIME)
     }
 
     fun setCompassMode() {
@@ -82,8 +85,8 @@ class MissionFragment : Fragment(), MissionHandler {
 
     fun setPersonCurrent() {
         tMap.tMapView.setCenterPoint(
-            viewModel.personCurrentLocation.latitude,
-            viewModel.personCurrentLocation.longitude,
+            missionViewModel.personCurrentLocation.latitude,
+            missionViewModel.personCurrentLocation.longitude,
             true
         )
 
@@ -95,10 +98,10 @@ class MissionFragment : Fragment(), MissionHandler {
         with(tMap) {
             latitudes.clear()
             longitudes.clear()
-            latitudes.add(TEST_DESTINATION.latitude)
-            longitudes.add(TEST_DESTINATION.longitude)
-            latitudes.add(viewModel.personCurrentLocation.latitude)
-            longitudes.add(viewModel.personCurrentLocation.longitude)
+            latitudes.add((missionViewModel.destination.value?.coordinate?.latitude ?: "37.553836").toDouble())
+            longitudes.add((missionViewModel.destination.value?.coordinate?.longitude ?: "126.969652").toDouble())
+            latitudes.add(missionViewModel.personCurrentLocation.latitude)
+            longitudes.add(missionViewModel.personCurrentLocation.longitude)
             setRouteDetailFocus()
             isTracking = false
         }
@@ -108,7 +111,7 @@ class MissionFragment : Fragment(), MissionHandler {
         val shortAnimationDuration =
             resources.getInteger(android.R.integer.config_shortAnimTime)
 
-        viewModel.timeIncreased.observe(viewLifecycleOwner) {
+        missionViewModel.timeIncreased.observe(viewLifecycleOwner) {
             val sign = if (it > 0) {
                 PLUS
             } else {
@@ -134,26 +137,11 @@ class MissionFragment : Fragment(), MissionHandler {
                     })
             }
         }
-
-        viewModel.errorMessage.observe(viewLifecycleOwner) {
-            it.getContentIfNotHandled()?.let { errorType ->
-                val message = getString(errorType.stringResourcesId)
-
-                Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
-            }
-        }
-        viewModel.transportIsArrived.observe(viewLifecycleOwner) {
-            it.getContentIfNotHandled()?.let { isArrived ->
-                if (isArrived) {
-                    Toast.makeText(requireContext(), "도착했습니다.", Toast.LENGTH_LONG).show()
-                }
-            }
-        }
     }
 
     override fun alertTMapReady() {
         requestPermissionsLauncher.launch(PERMISSIONS)
-        makeDestinationMarker()
+        getAlarmInfo()
     }
 
     override fun setOnEnableScrollWithZoomLevelListener() {
@@ -176,7 +164,7 @@ class MissionFragment : Fragment(), MissionHandler {
         var first = 0
         lateinit var beforeLocation: Location
         lifecycleScope.launch {
-            viewModel.userLocation.collect { userLocation ->
+            missionViewModel.userLocation.collect { userLocation ->
                 when (first) {
                     0 -> {
                         first += 1
@@ -188,7 +176,7 @@ class MissionFragment : Fragment(), MissionHandler {
                             Marker.PERSON_MARKER_IMG,
                             TMapPoint(userLocation.latitude, userLocation.longitude)
                         )
-                        viewModel.personCurrentLocation = userLocation
+                        missionViewModel.personCurrentLocation = userLocation
                         tMap.latitudes.add(userLocation.latitude)
                         tMap.longitudes.add(userLocation.longitude)
                         tMap.setRouteDetailFocus()
@@ -204,7 +192,7 @@ class MissionFragment : Fragment(), MissionHandler {
                             Marker.PERSON_LINE_COLOR
                         )
                         tMap.addMarker(Marker.PERSON_MARKER, Marker.PERSON_MARKER_IMG, nowLocation)
-                        viewModel.personCurrentLocation = userLocation
+                        missionViewModel.personCurrentLocation = userLocation
                         if (tMap.isTracking) {
                             tMap.tMapView.setCenterPoint(userLocation.latitude, userLocation.longitude)
                         }
@@ -217,15 +205,43 @@ class MissionFragment : Fragment(), MissionHandler {
         }
     }
 
-    private fun makeDestinationMarker() {
-        tMap.addMarker(Marker.DESTINATION_MARKER, Marker.DESTINATION_MARKER_IMG, TEST_DESTINATION)
-        tMap.latitudes.add(TEST_DESTINATION.latitude)
-        tMap.longitudes.add(TEST_DESTINATION.longitude)
+    private fun getAlarmInfo() {
+        alarmSettingViewModel.getAlarm()
+        val linePoints = arrayListOf<TMapPoint>()
+        val walkInfo = alarmSettingViewModel.alarmItem.value?.routes?.first() as WalkRoute
+        Log.d("MissionWorker", "route 그리기 ${alarmSettingViewModel.alarmItem.value?.routes?.first()}")
+        drawWalkRoute(walkInfo, linePoints)
+        tMap.drawWalkLines(linePoints, Marker.WALK_LINE, Marker.WALK_LINE_COLOR)
+
+        missionViewModel.destination.value = walkInfo.end
+        makeDestinationMarker(walkInfo.end)
+    }
+
+    private fun makeDestinationMarker(destination: Place) {
+        val latitude = destination.coordinate.latitude.toDouble()
+        val longitude = destination.coordinate.longitude.toDouble()
+        tMap.addMarker(
+            Marker.DESTINATION_MARKER,
+            Marker.DESTINATION_MARKER_IMG,
+            TMapPoint(latitude, longitude)
+        )
+        tMap.latitudes.add(latitude)
+        tMap.longitudes.add(longitude)
+    }
+
+
+    private fun drawWalkRoute(route: WalkRoute, linePoints: ArrayList<TMapPoint>) {
+        route.steps.forEach { step ->
+            step.lineString.split(" ").forEach { coordinate ->
+                val points = coordinate.split(",")
+
+                linePoints.add(TMapPoint(points.last().toDouble(), points.first().toDouble()))
+            }
+        }
     }
 
     companion object {
 
-        private const val DESTINATION = "구로3동현대아파트"
         private const val PLUS = "+"
         private const val MINUS = ""
         private const val LEFT_TIME = 60
@@ -235,7 +251,5 @@ class MissionFragment : Fragment(), MissionHandler {
         private val PERMISSIONS =
             arrayOf(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION)
 
-        private val TEST_DESTINATION = TMapPoint(37.553836, 126.969652)
-
     }
 }

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

@@ -20,4 +20,12 @@ class MissionTMap(
         tMapView.addTMapPolyLine(polyLine)
     }
 
+    fun drawWalkLines(points: ArrayList<TMapPoint>, id: String, color: Int) {
+        val polyLine = TMapPolyLine(id, points).apply {
+            lineColor = color
+            outLineColor = color
+        }
+        tMapView.addTMapPolyLine(polyLine)
+    }
+
 }

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

@@ -4,13 +4,12 @@ import android.util.Log
 import androidx.lifecycle.*
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
-import com.stop.model.ErrorType
-import com.stop.model.Event
+import com.stop.domain.model.route.tmap.custom.Place
 import com.stop.model.Location
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import java.util.UUID
+import java.util.*
 import javax.inject.Inject
 import kotlin.random.Random
 
@@ -22,9 +21,7 @@ class MissionViewModel @Inject constructor(
 
     private val random = Random(System.currentTimeMillis())
 
-    private val _destination = MutableLiveData<String>()
-    val destination: LiveData<String>
-        get() = _destination
+    val destination= MutableLiveData<Place>()
 
     private val _timeIncreased = MutableLiveData<Int>()
     val timeIncreased: LiveData<Int>
@@ -34,14 +31,6 @@ class MissionViewModel @Inject constructor(
     val estimatedTimeRemaining: LiveData<Int>
         get() = _estimatedTimeRemaining
 
-    private val _errorMessage = MutableLiveData<Event<ErrorType>>()
-    val errorMessage: LiveData<Event<ErrorType>>
-        get() = _errorMessage
-
-    private val _transportIsArrived = MutableLiveData<Event<Boolean>>()
-    val transportIsArrived: LiveData<Event<Boolean>>
-        get() = _transportIsArrived
-
     val leftMinute: LiveData<String> = Transformations.switchMap(estimatedTimeRemaining) {
         MutableLiveData<String>().apply {
             value = (it / TIME_UNIT).toString().padStart(TIME_DIGIT, '0')
@@ -64,10 +53,6 @@ class MissionViewModel @Inject constructor(
         makeMissionWorker()
     }
 
-    fun setDestination(inputDestination: String) {
-        _destination.value = inputDestination
-    }
-
     fun countDownWith(startTime: Int) {
         _estimatedTimeRemaining.value = startTime
         var leftTime = startTime

presentation/src/main/java/com/stop/ui/util/Marker.kt

@@ -20,4 +20,7 @@ object Marker {
 
     const val DESTINATION_MARKER = "destination_marker"
     const val DESTINATION_MARKER_IMG = R.drawable.ic_start_marker
+
+    const val WALK_LINE = "walk_line"
+    const val WALK_LINE_COLOR = Color.BLACK
 }

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

@@ -9,6 +9,10 @@
             name="viewModel"
             type="com.stop.ui.alarmsetting.AlarmSettingViewModel" />
 
+        <variable
+            name="fragment"
+            type="com.stop.ui.map.MapFragment" />
+
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -115,6 +119,7 @@
             android:textColor="@color/black"
             android:textSize="36sp"
             android:textStyle="bold"
+            android:onClick="@{() -> fragment.setMissionStart()}"
             app:layout_constraintBottom_toTopOf="@id/button_alarm_turn_off"
             app:layout_constraintEnd_toEndOf="@id/guide_line_end"
             app:layout_constraintStart_toStartOf="@id/guide_line_start"