Merge branch 'develop_front' of https://github.com/tukcomCD2024/YooDoRi…

… into develop_front
tukcomCD2024 · Jun 20, 2024 · dce88a9 · dce88a9
2 parents e1fe3f4 + 2eab52b
commit dce88a9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/frontend/app/build.gradle.kts b/frontend/app/build.gradle.kts
@@ -13,6 +13,8 @@ plugins {
 
     // Firebase추가를 위함
     id("com.google.gms.google-services")
+
+    id ("kotlin-parcelize")
 }
 
 val properties = Properties().apply{

diff --git a/...end/app/src/main/java/kr/ac/tukorea/whereareu/data/model/nok/home/LocationInfoResponse.kt b/...end/app/src/main/java/kr/ac/tukorea/whereareu/data/model/nok/home/LocationInfoResponse.kt
@@ -1,7 +1,10 @@
 package kr.ac.tukorea.whereareu.data.model.nok.home
 
 import kr.ac.tukorea.whereareu.domain.home.LocationInfo
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
 
+@Parcelize
 data class LocationInfoResponse(
     val battery: Int,
     val isGpsOn: Boolean,
@@ -12,7 +15,7 @@ data class LocationInfoResponse(
     val userStatus: String,
     val bearing: Float,
     val currentSpeed: Float
-){
+): Parcelable{
     constructor(): this(100, true, true, 0, 37.5666103, 126.9783882, "", 0f, 0f)
     fun toModel(isPredicted: Boolean): LocationInfo {
         return LocationInfo(battery, isGpsOn, isInternetOn, isRingstoneOn, latitude, longitude, userStatus, bearing, currentSpeed, isPredicted)

diff --git a/frontend/app/src/main/java/kr/ac/tukorea/whereareu/presentation/nok/home/NokHomeViewModel.kt b/frontend/app/src/main/java/kr/ac/tukorea/whereareu/presentation/nok/home/NokHomeViewModel.kt
@@ -1,8 +1,13 @@
 package kr.ac.tukorea.whereareu.presentation.nok.home
 
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.naver.maps.geometry.LatLng
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.async