feat : 시간 만료시 애니메이션 안나오던 이슈 해결

Author: jeeminimini

presentation/src/main/assets/fail_animation2.json

@@ -0,0 +1 @@
+{"v":"5.7.4","fr":30,"ip":0,"op":45,"w":500,"h":500,"nm":"Faild Icon","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Cross","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.214],"y":[1]},"o":{"x":[0.284],"y":[0]},"t":16,"s":[0]},{"t":33,"s":[90]}],"ix":10},"p":{"a":0,"k":[250.125,250,0],"ix":2,"l":2},"a":{"a":0,"k":[-3.875,7,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-48.75,38.25],[35,-45.75]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":42,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.214],"y":[1]},"o":{"x":[0.284],"y":[0]},"t":16,"s":[100]},{"t":33,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":4,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":-90,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line-2","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-45.75,49],[38,-35]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":42,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.214],"y":[1]},"o":{"x":[0.284],"y":[0]},"t":16,"s":[0]},{"t":33,"s":[0]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.214],"y":[1]},"o":{"x":[0.284],"y":[0]},"t":16,"s":[0]},{"t":33,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":4,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line-1","np":4,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Red Circle","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.316,0.316,0.667],"y":[1,1,1]},"o":{"x":[0.742,0.742,0.333],"y":[0,0,0]},"t":0,"s":[0,0,100]},{"i":{"x":[0.283,0.283,0.667],"y":[1,1,1]},"o":{"x":[0.839,0.839,0.333],"y":[0,0,0]},"t":10,"s":[111,111,100]},{"t":15,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[8.783,21.204],[16.229,16.229],[21.204,8.783],[22.951,0],[28.741,-19.204],[13.229,-31.935],[-6.744,-33.902],[-24.442,-24.442],[-33.902,-6.744],[-31.935,13.229],[-19.204,28.741],[0,34.567]],"o":[[-8.783,-21.205],[-16.228,-16.228],[-21.204,-8.782],[-34.566,0],[-28.742,19.203],[-13.228,31.935],[6.744,33.902],[24.442,24.442],[33.902,6.743],[31.935,-13.228],[19.204,-28.741],[0,-22.951]],"v":[[161.467,-66.882],[123.581,-123.582],[66.882,-161.468],[0,-174.771],[-97.097,-145.316],[-161.467,-66.882],[-171.413,34.096],[-123.582,123.581],[-34.096,171.413],[66.882,161.467],[145.316,97.097],[174.771,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.874509803922,0.282352941176,0.349019607843,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0}],"markers":[]}

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

@@ -33,6 +33,7 @@ import com.stop.ui.alarmsetting.AlarmSettingViewModel
 import com.stop.ui.mission.MissionService.Companion.MISSION_LAST_TIME
 import com.stop.ui.mission.MissionService.Companion.MISSION_LOCATIONS
 import com.stop.ui.mission.MissionService.Companion.MISSION_OVER
+import com.stop.ui.mission.MissionService.Companion.MISSION_TIME_OVER
 import com.stop.ui.util.Marker
 import kotlinx.coroutines.flow.collectIndexed
 import kotlinx.coroutines.launch
@@ -60,6 +61,7 @@ class MissionFragment : Fragment(), MissionHandler {
 
         setMissionService()
         setBroadcastReceiver()
+        setTimeOverBroadcastReceiver()
         missionViewModel.missionStatus.value = MissionStatus.ONGOING
     }
 
@@ -124,8 +126,20 @@ class MissionFragment : Fragment(), MissionHandler {
                 missionViewModel.lastTime.value = intent?.getStringExtra(MISSION_LAST_TIME)
                 missionViewModel.userLocations.value =
                     intent?.getParcelableArrayListExtra<Location>(MISSION_LOCATIONS) as ArrayList<Location>
+            }
+        }
+
+        requireActivity().registerReceiver(receiver, intentFilter)
+    }
 
-                if (intent.getBooleanExtra(MISSION_OVER, false)) {
+    private fun setTimeOverBroadcastReceiver() {
+        val intentFilter = IntentFilter().apply {
+            addAction(MISSION_TIME_OVER)
+        }
+
+        val receiver = object : BroadcastReceiver() {
+            override fun onReceive(context: Context?, intent: Intent?) {
+                if (intent?.getBooleanExtra(MISSION_TIME_OVER, false) == true) {
                     Snackbar.make(
                         requireActivity().findViewById(R.id.constraint_layout_container),
                         "시간이 만료되어 미션에 실패하셨습니다.",
@@ -136,7 +150,6 @@ class MissionFragment : Fragment(), MissionHandler {
 
             }
         }
-
         requireActivity().registerReceiver(receiver, intentFilter)
     }
 

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

@@ -8,6 +8,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Looper
+import android.util.Log
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.lifecycle.LifecycleService
@@ -177,8 +178,8 @@ class MissionService : LifecycleService() {
 
     private fun sendMissionOver() {
         val statusIntent = Intent().apply {
-            action = MISSION_OVER
-            putExtra(MISSION_OVER, true)
+            action = MISSION_TIME_OVER
+            putExtra(MISSION_TIME_OVER, true)
         }
         sendBroadcast(statusIntent)
     }
@@ -199,6 +200,7 @@ class MissionService : LifecycleService() {
         const val MISSION_LOCATIONS = "mission_locations"
         const val MISSION_USER_INFO = "mission_user_info"
         const val MISSION_OVER = "mission_over"
+        const val MISSION_TIME_OVER = "mission_time_over"
         const val MISSION_STATUS = "mission_status"
     }
 

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

@@ -223,7 +223,7 @@
             app:lottie_loop="false"
             app:lottie_autoPlay="false"
             android:visibility="gone"
-            app:lottie_fileName="fail_animation.json"
+            app:lottie_fileName="fail_animation2.json"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"