Skip to content

Commit d260f66

Browse files
committed
fix : _isMissionFail 값 넣는 것을 postValue로 변경
- _alarmItem의 데이터가 null일 때가 있음 -> 미션 터짐
1 parent fddf157 commit d260f66

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class AlarmSettingViewModel @Inject constructor(
7777
}
7878

7979
fun callAlarm(time: String) {
80-
alarmFunctions.callAlarm("10:00:00", alarmTime.value ?: 0, ALARM_CODE)
80+
alarmFunctions.callAlarm(time, alarmTime.value ?: 0, ALARM_CODE)
8181
}
8282

8383
private fun cancelAlarm() {
@@ -117,7 +117,7 @@ class AlarmSettingViewModel @Inject constructor(
117117
oldTimeMillis = System.currentTimeMillis()
118118
}
119119
}
120-
_isMissionFail.value = true
120+
_isMissionFail.postValue(true)
121121
}
122122
}
123123

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.stop.ui.mission
33
import android.Manifest
44
import android.animation.Animator
55
import android.os.Bundle
6-
import android.util.Log
76
import android.view.LayoutInflater
87
import android.view.View
98
import android.view.ViewGroup
@@ -12,7 +11,6 @@ import androidx.fragment.app.Fragment
1211
import androidx.fragment.app.activityViewModels
1312
import androidx.fragment.app.viewModels
1413
import androidx.lifecycle.lifecycleScope
15-
import androidx.navigation.fragment.findNavController
1614
import com.google.android.material.snackbar.Snackbar
1715
import com.skt.tmap.TMapPoint
1816
import com.stop.R
@@ -57,14 +55,12 @@ class MissionFragment : Fragment(), MissionHandler {
5755
setMissionOver()
5856
setMissionFail()
5957

60-
Log.d("MissionWorker","onViewCreated")
6158
}
6259

6360
override fun onDestroyView() {
6461
_binding = null
6562

6663
super.onDestroyView()
67-
Log.d("MissionWorker","onDestroyView")
6864
}
6965

7066
private fun setDataBinding() {
@@ -112,8 +108,7 @@ class MissionFragment : Fragment(), MissionHandler {
112108
fun clickMissionOver() {
113109
Snackbar.make(requireActivity().findViewById(R.id.constraint_layout_container), "미션을 취소합니다", Snackbar.LENGTH_SHORT).show()
114110
missionViewModel.isMissionOver.value = true
115-
findNavController().navigate(R.id.action_missionFragment_to_mapFragment)
116-
Log.d("MissionWorker","clickMissionOver")
111+
//findNavController().navigate(R.id.action_missionFragment_to_mapFragment)
117112
}
118113

119114
override fun alertTMapReady() {
@@ -233,7 +228,6 @@ class MissionFragment : Fragment(), MissionHandler {
233228

234229
override fun onAnimationEnd(animation: Animator) {
235230
//findNavController().navigate(R.id.action_missionFragment_to_mapFragment)
236-
Log.d("MissionWorker","setSuccessAnimation onAnimationEnd")
237231
}
238232

239233
override fun onAnimationCancel(animation: Animator) {
@@ -264,7 +258,6 @@ class MissionFragment : Fragment(), MissionHandler {
264258

265259
override fun onAnimationEnd(animation: Animator) {
266260
//findNavController().navigate(R.id.action_missionFragment_to_mapFragment)
267-
Log.d("MissionWorker","setFailAnimation onAnimationEnd")
268261
}
269262

270263
override fun onAnimationCancel(animation: Animator) {
@@ -287,11 +280,6 @@ class MissionFragment : Fragment(), MissionHandler {
287280
}
288281
}
289282

290-
override fun onDestroy() {
291-
super.onDestroy()
292-
Log.d("MissionWorker","onDestroy")
293-
}
294-
295283
companion object {
296284
private var PERSON_LINE_NUM = 0
297285

0 commit comments

Comments
 (0)