@@ -56,6 +56,8 @@ class MissionFragment : Fragment(), MissionHandler {
56
56
initTMap()
57
57
setMissionOver()
58
58
setMissionFail()
59
+
60
+ Log .d(" MissionWorker" ," onViewCreated" )
59
61
}
60
62
61
63
override fun onDestroyView () {
@@ -110,7 +112,7 @@ class MissionFragment : Fragment(), MissionHandler {
110
112
fun clickMissionOver () {
111
113
Snackbar .make(requireActivity().findViewById(R .id.constraint_layout_container), " 미션을 취소합니다" , Snackbar .LENGTH_SHORT ).show()
112
114
missionViewModel.isMissionOver.value = true
113
- findNavController().navigate(R .id.action_missionFragment_to_mapFragment)
115
+ // findNavController().navigate(R.id.action_missionFragment_to_mapFragment)
114
116
}
115
117
116
118
override fun alertTMapReady () {
@@ -142,7 +144,7 @@ class MissionFragment : Fragment(), MissionHandler {
142
144
if (index == 1 ) {
143
145
initMarker(userLocation)
144
146
beforeLocation = userLocation
145
- } else {
147
+ } else if (index > 1 ) {
146
148
drawNowLocationLine(TMapPoint (userLocation.latitude, userLocation.longitude), TMapPoint (beforeLocation.latitude, beforeLocation.longitude))
147
149
personCurrentLocation = userLocation
148
150
if (tMap.isTracking) {
@@ -185,6 +187,7 @@ class MissionFragment : Fragment(), MissionHandler {
185
187
private fun getAlarmInfo () {
186
188
alarmSettingViewModel.getAlarm()
187
189
val linePoints = arrayListOf<TMapPoint >()
190
+ Log .d(" MissionWorker" ," alarm으로 부터의 데이터 ${alarmSettingViewModel.alarmItem.value?.routes?.first()} " )
188
191
val walkInfo = alarmSettingViewModel.alarmItem.value?.routes?.first() as WalkRoute
189
192
tMap.drawWalkRoute(walkInfo, linePoints)
190
193
tMap.drawWalkLines(linePoints, Marker .WALK_LINE , Marker .WALK_LINE_COLOR )
@@ -229,7 +232,7 @@ class MissionFragment : Fragment(), MissionHandler {
229
232
}
230
233
231
234
override fun onAnimationEnd (animation : Animator ) {
232
- findNavController().navigate(R .id.action_missionFragment_to_mapFragment)
235
+ // findNavController().navigate(R.id.action_missionFragment_to_mapFragment)
233
236
}
234
237
235
238
override fun onAnimationCancel (animation : Animator ) {
@@ -259,7 +262,7 @@ class MissionFragment : Fragment(), MissionHandler {
259
262
}
260
263
261
264
override fun onAnimationEnd (animation : Animator ) {
262
- findNavController().navigate(R .id.action_missionFragment_to_mapFragment)
265
+ // findNavController().navigate(R.id.action_missionFragment_to_mapFragment)
263
266
}
264
267
265
268
override fun onAnimationCancel (animation : Animator ) {
0 commit comments