Skip to content

Commit aad18b6

Browse files
committed
feat : drawMoveLine 함수 수정
- 인자로 id와 color를 받게 하여 재활용 할 수 있도록 구현
1 parent 08eff28 commit aad18b6

File tree

2 files changed

+31
-11
lines changed

2 files changed

+31
-11
lines changed

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.stop.ui.mission
33
import android.animation.Animator
44
import android.animation.AnimatorListenerAdapter
55
import android.content.ContextWrapper
6+
import android.graphics.Color
67
import android.os.Bundle
78
import android.view.LayoutInflater
89
import android.view.View
@@ -15,7 +16,7 @@ import com.stop.databinding.FragmentMissionBinding
1516
import dagger.hilt.android.AndroidEntryPoint
1617

1718
@AndroidEntryPoint
18-
class MissionFragment : Fragment() , MissionHandler{
19+
class MissionFragment : Fragment(), MissionHandler {
1920

2021
private var _binding: FragmentMissionBinding? = null
2122
private val binding: FragmentMissionBinding
@@ -129,7 +130,13 @@ class MissionFragment : Fragment() , MissionHandler{
129130
}
130131

131132
override fun setOnLocationChangeListener(nowLocation: TMapPoint, beforeLocation: TMapPoint) {
132-
tMap.drawMoveLine(nowLocation, beforeLocation)
133+
tMap.drawMoveLine(
134+
nowLocation,
135+
beforeLocation,
136+
PERSON_LINE + PERSON_LINE_NUM.toString(),
137+
PERSON_LINE_COLOR
138+
)
139+
PERSON_LINE_NUM += 1
133140
}
134141

135142
override fun setOnEnableScrollWithZoomLevelListener() {
@@ -143,5 +150,13 @@ class MissionFragment : Fragment() , MissionHandler{
143150
private const val LEFT_TIME = 60
144151

145152
private const val FAKE_USER_FILE_PATH = "fake_user_path"
153+
154+
private const val PERSON_LINE = "person_line"
155+
private const val PERSON_LINE_COLOR = Color.MAGENTA
156+
private var PERSON_LINE_NUM = 0
157+
158+
private const val BUS_LINE = "bus_line"
159+
private const val BUS_LINE_COLOR = Color.BLUE
160+
private var BUS_LINE_NUM = 0
146161
}
147162
}

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,26 @@ class MissionTMap(
1212
handler: MissionHandler,
1313
) : TMap(context, handler) {
1414

15-
private var lineNum = 0
16-
17-
fun drawMoveLine(nowLocation: TMapPoint, beforeLocation: TMapPoint) {
15+
fun drawMoveLine(nowLocation: TMapPoint, beforeLocation: TMapPoint, id: String, color: Int) {
1816
val points = arrayListOf(nowLocation, beforeLocation)
19-
val polyLine = TMapPolyLine(PERSON_LINE + lineNum.toString(), points).apply {
20-
lineColor = LINE_COLOR
21-
outLineColor = LINE_COLOR
17+
val polyLine = TMapPolyLine(id, points).apply {
18+
lineColor = color
19+
outLineColor = color
2220
}
23-
lineNum += 1
2421
tMapView.addTMapPolyLine(polyLine)
2522
}
2623

2724
fun moveLocation(longitude: String, latitude: String) {
2825
val mockLocation = TMapPoint(latitude.toDouble(), longitude.toDouble())
2926

30-
drawMoveLine(mockLocation, tMapView.locationPoint)
27+
drawMoveLine(
28+
mockLocation,
29+
tMapView.locationPoint,
30+
PERSON_LINE + PERSON_LINE_NUM.toString(),
31+
PERSON_LINE_COLOR
32+
)
33+
PERSON_LINE_NUM += 1
34+
3135
makeMarker(PERSON_MARKER, PERSON_MARKER_IMG, mockLocation)
3236
tMapView.setLocationPoint(mockLocation.latitude, mockLocation.longitude)
3337
}
@@ -44,7 +48,8 @@ class MissionTMap(
4448
private const val PERSON_MARKER_IMG = R.drawable.ic_person_pin
4549

4650
private const val PERSON_LINE = "person_line"
47-
private const val LINE_COLOR = Color.MAGENTA
51+
private const val PERSON_LINE_COLOR = Color.MAGENTA
52+
private var PERSON_LINE_NUM = 0
4853
}
4954

5055
}

0 commit comments

Comments
 (0)