Merge pull request #100 from boostcampwm-2022/97-feature-mission-service

[PR] 미션 Foreground Service로 마이그레이션

Author: jeeminimini

presentation/src/main/AndroidManifest.xml

@@ -6,7 +6,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
@@ -33,6 +34,8 @@
 
         <service android:name=".alarm.SoundService" />
 
+        <service android:name=".ui.mission.MissionService"/>
+
         <service android:name=".alarm.SoundRestartService" />
 
         <provider

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/alarm/AlarmReceiver.kt

@@ -28,7 +28,7 @@ class AlarmReceiver : BroadcastReceiver() {
             val alarmStartPendingIntent = context.getActivityPendingIntent(
                 Intent(context, AlarmActivity::class.java).apply {
                     putExtra("ALARM_CODE", ALARM_CODE)
-                    flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
+                    flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
                 },
                 ALARM_CODE
             )
@@ -44,7 +44,7 @@ class AlarmReceiver : BroadcastReceiver() {
 
             Intent(context, AlarmActivity::class.java).apply {
                 putExtra("ALARM_CODE", ALARM_CODE)
-                flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
+                flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
                 context.startActivity(this)
             }
         }

presentation/src/main/java/com/stop/di/MissionModule.kt

@@ -0,0 +1,5 @@
+package com.stop.model
+
+enum class AlarmStatus(val text: String) {
+    NON_EXIST("현재 등록된 막차 알림이 없습니다"), EXIST("드래그하여 등록된 막차 알림을 확인할 수 있습니다"), MISSION("진행중인 미션이 있습니다")
+}

presentation/src/main/java/com/stop/model/AlarmStatus.kt

@@ -1,6 +1,10 @@
 package com.stop.model
 
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class Location(
     val latitude: Double,
     val longitude: Double
-)
+) : Parcelable

presentation/src/main/java/com/stop/model/Location.kt

@@ -0,0 +1,5 @@
+package com.stop.model
+
+enum class MissionStatus(val text: String) {
+    BEFORE("미션 시작"), ONGOING("미션 진행중"), OVER("미션 시작")
+}

presentation/src/main/java/com/stop/model/MissionStatus.kt

@@ -15,6 +15,8 @@ import com.stop.domain.usecase.alarm.DeleteAlarmUseCase
 import com.stop.domain.usecase.alarm.GetAlarmUseCase
 import com.stop.domain.usecase.alarm.SaveAlarmUseCase
 import com.stop.makeFullTime
+import com.stop.model.AlarmStatus
+import com.stop.model.MissionStatus
 import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_TIME
 import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.LAST_TIME
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -41,29 +43,38 @@ class AlarmSettingViewModel @Inject constructor(
     private val _alarmItem = MutableStateFlow<AlarmUseCaseItem?>(null)
     val alarmItem: StateFlow<AlarmUseCaseItem?> = _alarmItem
 
-    private val _isAlarmItemNotNull = MutableStateFlow(false)
-    val isAlarmItemNotNull: StateFlow<Boolean> = _isAlarmItemNotNull
+    var alarmStatus = MutableStateFlow(AlarmStatus.NON_EXIST)
 
     private lateinit var workerId: UUID
 
     private val _lastTimeCountDown = MutableLiveData("")
     val lastTimeCountDown: LiveData<String> = _lastTimeCountDown
 
-    private val _isMissionFail = MutableLiveData(false)
-    val isMissionFail: LiveData<Boolean> = _isMissionFail
-
     fun saveAlarm(alarmUseCaseItem: AlarmUseCaseItem) {
         viewModelScope.launch(Dispatchers.IO) {
             saveAlarmUseCase.saveAlarm(alarmUseCaseItem.copy(alarmTime = alarmTime.value ?: 0, alarmMethod = alarmMethod))
         }
     }
 
-    fun getAlarm() {
+    fun getAlarm(missionStatus: MissionStatus = MissionStatus.BEFORE) {
         viewModelScope.launch(Dispatchers.IO) {
             getAlarmUseCase.getAlarm().collectLatest {
                 _alarmItem.value = it
 
-                _isAlarmItemNotNull.value = it != null
+                if (it != null) {
+                    when(missionStatus){
+                        MissionStatus.BEFORE -> {
+                            alarmStatus.value = AlarmStatus.EXIST
+                        }
+                        MissionStatus.ONGOING -> {
+                            alarmStatus.value = AlarmStatus.MISSION
+                        }
+                        MissionStatus.OVER -> {
+                            alarmStatus.value = AlarmStatus.EXIST
+                        }
+                    }
+
+                }
             }
         }
     }
@@ -116,7 +127,6 @@ class AlarmSettingViewModel @Inject constructor(
                     oldTimeMillis = System.currentTimeMillis()
                 }
             }
-            _isMissionFail.postValue(true)
         }
     }
 

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

@@ -17,6 +17,7 @@ import com.stop.alarm.SoundService
 import com.stop.databinding.FragmentAlarmStartBinding
 import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_NOTIFICATION_HIGH_ID
 import com.stop.ui.alarmsetting.AlarmSettingViewModel
+import com.stop.ui.mission.MissionService.Companion.MISSION_CODE
 import kotlinx.coroutines.launch
 
 class AlarmStartFragment : Fragment() {
@@ -93,6 +94,16 @@ class AlarmStartFragment : Fragment() {
         notificationManager.cancel(ALARM_NOTIFICATION_HIGH_ID)
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        requireActivity().intent.extras?.getInt("MISSION_CODE")?.let {
+            if (it == MISSION_CODE) {
+                binding.root.findNavController().navigate(R.id.action_alarmStartFragment_to_missionFragment)
+            }
+        }
+    }
+
     override fun onDestroyView() {
         _binding = null
 

presentation/src/main/java/com/stop/ui/alarmstart/AlarmStartFragment.kt

@@ -2,29 +2,37 @@ package com.stop.ui.map
 
 import android.Manifest.permission
 import android.app.NotificationManager
+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.skt.tmap.TMapPoint
+import com.stop.AlarmActivity
 import com.stop.R
 import com.stop.RouteNavGraphDirections
 import com.stop.alarm.SoundService
 import com.stop.databinding.FragmentMapBinding
+import com.stop.model.AlarmStatus
 import com.stop.model.Location
+import com.stop.model.MissionStatus
 import com.stop.ui.alarmsetting.AlarmSettingFragment
 import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_MAP_CODE
 import com.stop.ui.alarmsetting.AlarmSettingViewModel
+import com.stop.ui.mission.MissionService
+import com.stop.ui.mission.MissionViewModel
 import com.stop.ui.placesearch.PlaceSearchViewModel
 import com.stop.ui.util.Marker
 import kotlinx.coroutines.launch
@@ -35,6 +43,9 @@ class MapFragment : Fragment(), MapHandler {
 
     private val alarmViewModel: AlarmSettingViewModel by activityViewModels()
     private val placeSearchViewModel: PlaceSearchViewModel by activityViewModels()
+    private val missionViewModel: MissionViewModel by viewModels()
+
+    private lateinit var missionServiceIntent: Intent
 
     private lateinit var tMap: MapTMap
     private var mapUIVisibility = View.GONE
@@ -56,6 +67,7 @@ class MapFragment : Fragment(), MapHandler {
         initTMap()
         initBottomSheetBehavior()
         initBottomSheetView()
+        setBroadcastReceiver()
     }
 
     override fun alertTMapReady() {
@@ -78,6 +90,7 @@ class MapFragment : Fragment(), MapHandler {
         binding.lifecycleOwner = viewLifecycleOwner
         binding.alarmViewModel = alarmViewModel
         binding.placeSearchViewModel = placeSearchViewModel
+        binding.missionViewModel = missionViewModel
         binding.fragment = this@MapFragment
     }
 
@@ -155,8 +168,18 @@ class MapFragment : Fragment(), MapHandler {
 
         val behavior = BottomSheetBehavior.from(binding.layoutHomeBottomSheet)
 
-        alarmViewModel.isAlarmItemNotNull.asLiveData().observe(viewLifecycleOwner) {
-            behavior.isDraggable = it
+        alarmViewModel.alarmStatus.asLiveData().observe(viewLifecycleOwner) { alarmStatus ->
+            when (alarmStatus) {
+                AlarmStatus.NON_EXIST -> {
+                    behavior.isDraggable = false
+                }
+                AlarmStatus.EXIST -> {
+                    behavior.isDraggable = true
+                }
+                AlarmStatus.MISSION -> {
+                    behavior.isDraggable = true
+                }
+            }
         }
 
         behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
@@ -183,9 +206,35 @@ class MapFragment : Fragment(), MapHandler {
             behavior.state = BottomSheetBehavior.STATE_COLLAPSED
             requireContext().stopService(intent)
             SoundService.normalExit = true
+
+            setMissionOver()
         }
     }
 
+    private fun setMissionOver() {
+        missionServiceIntent = Intent(requireActivity(), MissionService::class.java)
+        requireActivity().stopService(missionServiceIntent)
+        missionViewModel.missionStatus.value = MissionStatus.BEFORE
+        alarmViewModel.alarmStatus.value = AlarmStatus.NON_EXIST
+    }
+
+    private fun setBroadcastReceiver() {
+        val intentFilter = IntentFilter().apply {
+            addAction(MissionService.MISSION_STATUS)
+        }
+
+        val receiver = object : BroadcastReceiver() {
+            override fun onReceive(context: Context?, intent: Intent?) {
+                if (intent?.getBooleanExtra(MissionService.MISSION_STATUS, false) == true) {
+                    missionViewModel.missionStatus.value = MissionStatus.ONGOING
+                    alarmViewModel.alarmStatus.value = AlarmStatus.MISSION
+                }
+            }
+        }
+
+        requireActivity().registerReceiver(receiver, intentFilter)
+    }
+
     private fun observeClickPlace() {
         placeSearchViewModel.clickPlaceUseCaseItem.observe(viewLifecycleOwner) { event ->
             event.getContentIfNotHandled()?.let { clickPlace ->
@@ -204,7 +253,7 @@ class MapFragment : Fragment(), MapHandler {
     }
 
     private fun observeClickCurrentLocation() {
-        lifecycleScope.launch {
+        viewLifecycleOwner.lifecycleScope.launch {
             placeSearchViewModel.clickCurrentLocation
                 .flowWithLifecycle(viewLifecycleOwner.lifecycle)
                 .collect {
@@ -291,7 +340,11 @@ class MapFragment : Fragment(), MapHandler {
     }
 
     fun setMissionStart() {
-        // TODO 미션으로 보내는 작업해야함
+        Intent(requireContext(), AlarmActivity::class.java).apply {
+            putExtra("MISSION_CODE", MissionService.MISSION_CODE)
+            flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+            startActivity(this)
+        }
     }
 
     companion object {