diff --git a/app/src/main/java/com/sw/platecabinet/model/request/FeatureBody.kt b/app/src/main/java/com/sw/platecabinet/model/request/FeatureBody.kt new file mode 100644 index 0000000..e11c93c --- /dev/null +++ b/app/src/main/java/com/sw/platecabinet/model/request/FeatureBody.kt @@ -0,0 +1,6 @@ +package com.sw.platecabinet.model.request + +data class FeatureBody( + val url:String, + val featureChar:String +) \ No newline at end of file diff --git a/app/src/main/java/com/sw/platecabinet/network/api/ApiServiceV2.kt b/app/src/main/java/com/sw/platecabinet/network/api/ApiServiceV2.kt index a61a27b..9e9b956 100644 --- a/app/src/main/java/com/sw/platecabinet/network/api/ApiServiceV2.kt +++ b/app/src/main/java/com/sw/platecabinet/network/api/ApiServiceV2.kt @@ -2,6 +2,7 @@ package com.sw.platecabinet.network.api import com.sw.platecabinet.GlobalData import com.sw.platecabinet.model.DeviceConfigV2 +import com.sw.platecabinet.model.request.FeatureBody import com.sw.platecabinet.model.response.ApiResponse import com.sw.platecabinet.model.response.UserFaceModel import com.sw.platecabinet.model.response.UserFaceModelV2 @@ -46,11 +47,9 @@ interface ApiServiceV2 { * 添加人脸数据 */ @POST - @FormUrlEncoded suspend fun addUserFace( @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/user/add-by-face", - @Field("featureChar") faceData: String, - @Field("url") imageUr: String + @Body faceData: FeatureBody ): ApiResponse /** diff --git a/app/src/main/java/com/sw/platecabinet/repository/RemoteRepositoryV2.kt b/app/src/main/java/com/sw/platecabinet/repository/RemoteRepositoryV2.kt index 49f339e..9dc58a4 100644 --- a/app/src/main/java/com/sw/platecabinet/repository/RemoteRepositoryV2.kt +++ b/app/src/main/java/com/sw/platecabinet/repository/RemoteRepositoryV2.kt @@ -1,6 +1,7 @@ package com.sw.platecabinet.repository import com.sw.platecabinet.model.DeviceConfigV2 +import com.sw.platecabinet.model.request.FeatureBody import com.sw.platecabinet.model.response.ApiResponse import com.sw.platecabinet.model.response.UserFaceModel import com.sw.platecabinet.model.response.UserFaceModelV2 @@ -25,8 +26,7 @@ class RemoteRepositoryV2 constructor( return safeApiCall { apiService.getUserFaceCache( param = mapOf( - "pageNum" to pageNum, - "pageSize" to pageSize + "pageNum" to pageNum, "pageSize" to pageSize ) ) } @@ -34,16 +34,12 @@ class RemoteRepositoryV2 constructor( suspend fun getFaceIncrementList( - pageNum: Long, - pageSize: Long = 100L, - timestamp: Long + pageNum: Long, pageSize: Long = 100L, timestamp: Long ): ApiResponse?> { return safeApiCall { apiService.getFaceIncrementList( param = mapOf( - "pageNum" to pageNum, - "pageSize" to pageSize, - "timestamp" to timestamp + "pageNum" to pageNum, "pageSize" to pageSize, "timestamp" to timestamp ) ) } @@ -53,8 +49,14 @@ class RemoteRepositoryV2 constructor( return safeApiCall { apiService.getDeviceConfig() } } - suspend fun addUserFace(faceData: String, imageUr: String): ApiResponse { - return safeApiCall { apiService.addUserFace(faceData = faceData, imageUr = imageUr) } + suspend fun addUserFace(faceData: String, imageUrl: String): ApiResponse { + return safeApiCall { + apiService.addUserFace( + faceData = FeatureBody( + url = imageUrl, featureChar = faceData + ) + ) + } } suspend fun uploadImage(file: File): ApiResponse {