Merge branch '21-feat-보호자-홈-화면-api-연동' into develop_front

frontend/app/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
         android:theme="@style/Theme.WhereAreU"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
-        <service android:name=".util.LocationService" android:foregroundServiceType="location"
+        <service android:name=".util.location.LocationService" android:foregroundServiceType="location"
             tools:ignore="ForegroundServicePermission" />
 
         <meta-data
@@ -32,7 +32,7 @@
         <activity
             android:name=".presentation.login.SplashActivity"
             android:exported="true"
-            android:label="@string/title_activity_splash"
+            android:label="@string/app_name"
             android:theme="@style/Theme.WhereAreU">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -41,14 +41,15 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".presentation.nok.MainNokActivity"
+            android:name=".presentation.nok.NokMainActivity"
             android:exported="false"
             android:theme="@style/Theme.WhereAreU"/>
         <activity
             android:name=".presentation.login.LoginActivity"
             android:exported="false"
             android:theme="@style/Theme.WhereAreU">
         </activity>
+        <activity android:name="kr.ac.tukorea.whereareu.presentation.dementia.DementiaMainActivity" />
     </application>
 
 </manifest>

frontend/app/src/main/java/kr/ac/tukorea/whereareu/WhereAreUApplication.kt

@@ -7,11 +7,9 @@ import android.app.NotificationManager
 import android.content.Context
 import android.os.Build
 import androidx.annotation.StringRes
-import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.ViewModelProvider.NewInstanceFactory.Companion.instance
-import kr.ac.tukorea.whereareu.util.NetworkConnectionChecker
+import kr.ac.tukorea.whereareu.util.network.NetworkConnectionChecker
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp

frontend/app/src/main/java/kr/ac/tukorea/whereareu/data/api/DementiaHomeService.kt

@@ -0,0 +1,16 @@
+package kr.ac.tukorea.whereareu.data.api
+
+import kr.ac.tukorea.whereareu.data.model.ResponseBody
+import kr.ac.tukorea.whereareu.data.model.home.LocationInfo
+import kr.ac.tukorea.whereareu.data.model.home.PostLocationInfoResponse
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface DementiaHomeService {
+    @POST("receive-location-info")
+    suspend fun postLocationInfo(
+        @Body request: LocationInfo
+    ): Response<PostLocationInfoResponse>
+
+}

frontend/app/src/main/java/kr/ac/tukorea/whereareu/data/api/NokHomeService.kt

@@ -0,0 +1,14 @@
+package kr.ac.tukorea.whereareu.data.api
+
+import kr.ac.tukorea.whereareu.data.model.ResponseBody
+import kr.ac.tukorea.whereareu.data.model.home.GetLocationInfoResponse
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+interface NokHomeService {
+    @GET("send-live-location-info")
+    suspend fun getDementiaLocationInfo(@Query("dementiaKey") dementiaKey: String): Response<ResponseBody<GetLocationInfoResponse>>
+}

frontend/app/src/main/java/kr/ac/tukorea/whereareu/data/model/home/GetLocationInfoResponse.kt

@@ -0,0 +1,15 @@
+package kr.ac.tukorea.whereareu.data.model.home
+
+data class GetLocationInfoResponse(
+    val battery: Int,
+    val isGpsOn: Boolean,
+    val isInternetOn: Boolean,
+    val isRingstoneOn: Int,
+    val latitude: Double,
+    val longitude: Double,
+    val message: String,
+    val status: String,
+    val userStatus: Int,
+    val bearing: Float,
+    val currentSpeed: Float
+)

frontend/app/src/main/java/kr/ac/tukorea/whereareu/data/model/LocationInfo.kt → frontend/app/src/main/java/kr/ac/tukorea/whereareu/data/model/home/LocationInfo.kt

@@ -1,6 +1,7 @@
-package kr.ac.tukorea.whereareu.data.model
+package kr.ac.tukorea.whereareu.data.model.home
 
 import com.google.gson.annotations.SerializedName
+import java.io.Serializable
 import java.util.Date
 
 data class LocationInfo(
@@ -17,6 +18,7 @@ data class LocationInfo(
     val battery: Int,
     val isInternetOn: Boolean,
     val isGpsOn: Boolean,
-    val isRingstoneOn: Boolean
-)
+    val isRingstoneOn: Int,
+    val bearing: Float
+): Serializable
 

frontend/app/src/main/java/kr/ac/tukorea/whereareu/data/model/home/PostLocationInfoResponse.kt

@@ -0,0 +1,7 @@
+package kr.ac.tukorea.whereareu.data.model.home
+
+data class PostLocationInfoResponse(
+    val message: String,
+    val status: String,
+    val result: Int
+)

frontend/app/src/main/java/kr/ac/tukorea/whereareu/data/repository/home/DementiaHomeRepository.kt

@@ -0,0 +1,9 @@
+package kr.ac.tukorea.whereareu.data.repository.home
+
+import kr.ac.tukorea.whereareu.data.model.home.LocationInfo
+import kr.ac.tukorea.whereareu.data.model.home.PostLocationInfoResponse
+import kr.ac.tukorea.whereareu.util.network.NetworkResult
+
+interface DementiaHomeRepository {
+    suspend fun postLocationInfo(request: LocationInfo): NetworkResult<PostLocationInfoResponse>
+}

frontend/app/src/main/java/kr/ac/tukorea/whereareu/data/repository/home/DementiaHomeRepositoryImpl.kt

@@ -0,0 +1,17 @@
+package kr.ac.tukorea.whereareu.data.repository.home
+
+import kr.ac.tukorea.whereareu.data.api.DementiaHomeService
+import kr.ac.tukorea.whereareu.data.model.ResponseBody
+import kr.ac.tukorea.whereareu.data.model.home.LocationInfo
+import kr.ac.tukorea.whereareu.data.model.home.PostLocationInfoResponse
+import kr.ac.tukorea.whereareu.util.network.NetworkResult
+import kr.ac.tukorea.whereareu.util.network.handleApi
+import javax.inject.Inject
+
+class DementiaHomeRepositoryImpl @Inject constructor(
+    private val api: DementiaHomeService
+): DementiaHomeRepository {
+    override suspend fun postLocationInfo(request: LocationInfo): NetworkResult<PostLocationInfoResponse> {
+        return handleApi({api.postLocationInfo(request)}) {response: PostLocationInfoResponse -> response}
+    }
+}

frontend/app/src/main/java/kr/ac/tukorea/whereareu/data/repository/home/NokHomeRepository.kt

@@ -0,0 +1,8 @@
+package kr.ac.tukorea.whereareu.data.repository.home
+
+import kr.ac.tukorea.whereareu.data.model.home.GetLocationInfoResponse
+import kr.ac.tukorea.whereareu.util.network.NetworkResult
+
+interface NokHomeRepository {
+    suspend fun getDementiaLocationInfo(dementiaKey: String): NetworkResult<GetLocationInfoResponse>
+}

frontend/app/src/main/java/kr/ac/tukorea/whereareu/data/repository/home/NokHomeRepositoryImpl.kt

@@ -0,0 +1,17 @@
+package kr.ac.tukorea.whereareu.data.repository.home
+
+import kr.ac.tukorea.whereareu.data.api.NokHomeService
+import kr.ac.tukorea.whereareu.data.model.ResponseBody
+import kr.ac.tukorea.whereareu.data.model.home.GetLocationInfoResponse
+import kr.ac.tukorea.whereareu.util.network.NetworkResult
+import kr.ac.tukorea.whereareu.util.network.handleApi
+import javax.inject.Inject
+
+class NokHomeRepositoryImpl @Inject constructor(
+    private val api: NokHomeService
+): NokHomeRepository{
+    override suspend fun getDementiaLocationInfo(dementiaKey: String): NetworkResult<GetLocationInfoResponse> {
+        return handleApi({api.getDementiaLocationInfo(dementiaKey)}) {response: ResponseBody<GetLocationInfoResponse> -> response.result}
+    }
+
+}

frontend/app/src/main/java/kr/ac/tukorea/whereareu/data/repository/LoginRepository.kt → frontend/app/src/main/java/kr/ac/tukorea/whereareu/data/repository/login/LoginRepository.kt

@@ -1,12 +1,12 @@
-package kr.ac.tukorea.whereareu.data.repository
+package kr.ac.tukorea.whereareu.data.repository.login
 
 import kr.ac.tukorea.whereareu.data.model.login.request.CheckInterConnectRequest
 import kr.ac.tukorea.whereareu.data.model.login.response.CheckInterConnectResponse
 import kr.ac.tukorea.whereareu.data.model.login.request.DementiaIdentityRequest
 import kr.ac.tukorea.whereareu.data.model.login.request.NokIdentityRequest
 import kr.ac.tukorea.whereareu.data.model.login.response.DementiaIdentityResponse
 import kr.ac.tukorea.whereareu.data.model.login.response.NokIdentityResponse
-import kr.ac.tukorea.whereareu.util.NetworkResult
+import kr.ac.tukorea.whereareu.util.network.NetworkResult
 
 interface LoginRepository {
     suspend fun sendNokIdentity(request: NokIdentityRequest): NetworkResult<NokIdentityResponse>

frontend/app/src/main/java/kr/ac/tukorea/whereareu/data/repository/LoginRepositoryImpl.kt → frontend/app/src/main/java/kr/ac/tukorea/whereareu/data/repository/login/LoginRepositoryImpl.kt

@@ -1,4 +1,4 @@
-package kr.ac.tukorea.whereareu.data.repository
+package kr.ac.tukorea.whereareu.data.repository.login
 
 import kr.ac.tukorea.whereareu.data.model.login.request.NokIdentityRequest
 import kr.ac.tukorea.whereareu.data.model.login.response.NokIdentityResponse
@@ -8,8 +8,8 @@ import kr.ac.tukorea.whereareu.data.model.login.response.CheckInterConnectRespon
 import kr.ac.tukorea.whereareu.data.model.login.request.DementiaIdentityRequest
 import kr.ac.tukorea.whereareu.data.model.ResponseBody
 import kr.ac.tukorea.whereareu.data.model.login.response.DementiaIdentityResponse
-import kr.ac.tukorea.whereareu.util.NetworkResult
-import kr.ac.tukorea.whereareu.util.handleApi
+import kr.ac.tukorea.whereareu.util.network.NetworkResult
+import kr.ac.tukorea.whereareu.util.network.handleApi
 import javax.inject.Inject
 
 class LoginRepositoryImpl @Inject constructor(

frontend/app/src/main/java/kr/ac/tukorea/whereareu/di/NetworkModule.kt

@@ -7,8 +7,9 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import kr.ac.tukorea.whereareu.R
 import kr.ac.tukorea.whereareu.WhereAreUApplication
-import kr.ac.tukorea.whereareu.data.api.HomeService
+import kr.ac.tukorea.whereareu.data.api.DementiaHomeService
 import kr.ac.tukorea.whereareu.data.api.LoginService
+import kr.ac.tukorea.whereareu.data.api.NokHomeService
 import okhttp3.Interceptor
 import okhttp3.Interceptor.*
 import okhttp3.OkHttpClient
@@ -69,7 +70,13 @@ object NetworkModule {
 
     @Provides
     @Singleton
-    fun provideHomeApi(retrofit: Retrofit): HomeService {
+    fun provideDementiaHomeApi(retrofit: Retrofit): DementiaHomeService {
+        return retrofit.buildService()
+    }
+
+    @Provides
+    @Singleton
+    fun provideNokHomeApi(retrofit: Retrofit): NokHomeService {
         return retrofit.buildService()
     }
 

frontend/app/src/main/java/kr/ac/tukorea/whereareu/di/RepositoryModule.kt

@@ -5,13 +5,12 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ViewModelComponent
 import dagger.hilt.android.scopes.ViewModelScoped
-import kr.ac.tukorea.whereareu.data.api.HomeService
+import kr.ac.tukorea.whereareu.data.api.DementiaHomeService
 import kr.ac.tukorea.whereareu.data.api.LoginService
-import kr.ac.tukorea.whereareu.data.repository.AxisDataSource
-import kr.ac.tukorea.whereareu.data.repository.HomeRepository
-import kr.ac.tukorea.whereareu.data.repository.HomeRepositoryImpl
-import kr.ac.tukorea.whereareu.data.repository.LoginRepository
-import kr.ac.tukorea.whereareu.data.repository.LoginRepositoryImpl
+import kr.ac.tukorea.whereareu.data.repository.home.DementiaHomeRepository
+import kr.ac.tukorea.whereareu.data.repository.home.DementiaHomeRepositoryImpl
+import kr.ac.tukorea.whereareu.data.repository.login.LoginRepository
+import kr.ac.tukorea.whereareu.data.repository.login.LoginRepositoryImpl
 
 @Module
 @InstallIn(ViewModelComponent::class)
@@ -26,6 +25,6 @@ object RepositoryModule {
     @ViewModelScoped
     @Provides
     fun providesHomeRepository(
-        homeService: HomeService
-    ): HomeRepository = HomeRepositoryImpl(homeService)
+        dementiaHomeService: DementiaHomeService
+    ): DementiaHomeRepository = DementiaHomeRepositoryImpl(dementiaHomeService)
 }