#18 운전 기록 전송 - LatLng 클래스 대신 Location 클래스, http logging

app/build.gradle

@@ -30,7 +30,7 @@ android {
         }
     }
     aaptOptions {
-        noCompress = "tflite"
+//        noCompress = "tflite"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -57,8 +57,8 @@ android {
 
 dependencies {
 
-    implementation 'org.tensorflow:tensorflow-lite-support:0.1.0'
-    implementation 'org.tensorflow:tensorflow-lite-metadata:0.1.0'
+//    implementation 'org.tensorflow:tensorflow-lite-support:0.1.0'
+//    implementation 'org.tensorflow:tensorflow-lite-metadata:0.1.0'
     def nav_version = "2.4.1"
 
     implementation 'androidx.core:core-ktx:1.7.0'
@@ -125,8 +125,8 @@ dependencies {
     // Easy Permissions
     implementation 'pub.devrel:easypermissions:3.0.0'
 
-    // Import tflite dependencies
-    implementation 'org.tensorflow:tensorflow-lite:0.0.0-nightly-SNAPSHOT'
+//    // Import tflite dependencies
+//    implementation 'org.tensorflow:tensorflow-lite:0.0.0-nightly-SNAPSHOT'
 
     // Import the BoM for the Firebase platform
     implementation platform('com.google.firebase:firebase-bom:29.0.4')
@@ -147,4 +147,7 @@ dependencies {
 
     // ml kit
     implementation 'com.google.android.gms:play-services-mlkit-face-detection:17.0.1'
+
+    // http logging
+    implementation("com.squareup.okhttp3:logging-interceptor:4.9.3")
 }

app/src/main/java/com/comye1/dontsleepdriver/data/DSDApi.kt

@@ -1,6 +1,7 @@
 package com.comye1.dontsleepdriver.data
 
 import com.comye1.dontsleepdriver.data.model.*
+import retrofit2.Call
 import retrofit2.http.*
 
 interface DSDApi {

app/src/main/java/com/comye1/dontsleepdriver/data/model/DrivingBody.kt

@@ -1,12 +1,36 @@
 package com.comye1.dontsleepdriver.data.model
 
-import com.google.android.gms.maps.model.LatLng
-
 data class DrivingBody(
     val startTime: String,
     val endTime: String,
-    val totalTime: Int,
-    val gpsData: List<LatLng>,
-    val gpsLevel: List<Int>,
-    val avgSleepLevel: Double
-)
+    val gpsData: Array<Location>,
+    val gpsLevel: Array<Int>,
+    val avgSleepLevel: Double,
+    val totalTime: Int
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as DrivingBody
+
+        if (startTime != other.startTime) return false
+        if (endTime != other.endTime) return false
+        if (!gpsData.contentEquals(other.gpsData)) return false
+        if (!gpsLevel.contentEquals(other.gpsLevel)) return false
+        if (avgSleepLevel != other.avgSleepLevel) return false
+        if (totalTime != other.totalTime) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = startTime.hashCode()
+        result = 31 * result + endTime.hashCode()
+        result = 31 * result + gpsData.contentHashCode()
+        result = 31 * result + gpsLevel.contentHashCode()
+        result = 31 * result + avgSleepLevel.hashCode()
+        result = 31 * result + totalTime
+        return result
+    }
+}

app/src/main/java/com/comye1/dontsleepdriver/data/model/DrivingData.kt

@@ -0,0 +1,10 @@
+package com.comye1.dontsleepdriver.data.model
+
+data class DrivingData(
+    val id: Int,
+    val startTime: String,
+    val endTime: String,
+    val avgSleepLevel: Double,
+    val totalTime: Int,
+    val driverId: Int
+)

app/src/main/java/com/comye1/dontsleepdriver/data/model/DrivingPostResponse.kt

@@ -3,6 +3,6 @@ package com.comye1.dontsleepdriver.data.model
 data class DrivingPostResponse(
     val success: Boolean,
     val message: String,
-    val data: DrivingResponse?,
+    val data: DrivingData?,
     val error: String
 )

app/src/main/java/com/comye1/dontsleepdriver/data/model/DrivingResponse.kt

@@ -1,13 +1,11 @@
 package com.comye1.dontsleepdriver.data.model
 
-import com.google.android.gms.maps.model.LatLng
-
 data class DrivingResponse(
     val id: Int,
     val startTime: String,
     val endTime: String,
     val totalTime: Int,
-    val gpsData: List<LatLng>,
+    val gpsData: List<Location>,
     val gpsLevel: List<Int>,
     val avgSleepLevel: Double
 ) {

app/src/main/java/com/comye1/dontsleepdriver/data/model/Location.kt

@@ -0,0 +1,6 @@
+package com.comye1.dontsleepdriver.data.model
+
+data class Location(
+    val lat: Double,
+    val lng: Double
+)

app/src/main/java/com/comye1/dontsleepdriver/repository/DSDRepository.kt

@@ -7,7 +7,12 @@ import androidx.core.content.edit
 import com.comye1.dontsleepdriver.data.DSDApi
 import com.comye1.dontsleepdriver.data.model.*
 import com.comye1.dontsleepdriver.util.Resource
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
 import dagger.hilt.android.scopes.ActivityScoped
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 import javax.inject.Inject
 
 @ActivityScoped
@@ -178,15 +183,18 @@ class DSDRepository @Inject constructor(
         return Resource.Success(response.data)
     }
 
-    suspend fun postDrivingItem(driving: DrivingBody): Resource<DrivingResponse> {
+    suspend fun postDrivingItem(driving: DrivingBody): Resource<DrivingData> {
         val token = getSavedToken() ?: return Resource.Error("token does not exist")
+
+        Log.d("postDrivingItem","repository")
+
         val response = try {
             api.postDriving(token.toTokenMap(), driving)
         } catch (e: Exception) {
-            Log.d("repo 9 exception", e.toString())
-            return Resource.Error(e.message ?: "")
+            Log.d("repo 10 exception", e.localizedMessage?: "")
+            return Resource.Error(e.toString())
         }
-        Log.d("repo 9 success", response.data.toString())
+        Log.d("repo 10 success", response.data.toString())
         response.data?.let {
             return Resource.Success(it)
         }