From dfbea8e8215f673d3c92679017286eb9c940e4c9 Mon Sep 17 00:00:00 2001 From: bigyoung8375 Date: Thu, 17 Nov 2022 17:30:52 +0900 Subject: [PATCH 1/2] 2022-11-17 17:30 -> retrofit callback add --- .../com/ssafy/smartstore/service/Resource.kt | 18 ++++++++++++++++++ .../ssafy/smartstore/service/ResourceError.kt | 5 +++++ .../ssafy/smartstore/service/UserService.kt | 3 +-- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/Resource.kt create mode 100644 client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/ResourceError.kt diff --git a/client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/Resource.kt b/client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/Resource.kt new file mode 100644 index 0000000..084b5e6 --- /dev/null +++ b/client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/Resource.kt @@ -0,0 +1,18 @@ +package com.ssafy.smartstore.service + +class Resource private constructor(val status: Resource.Status, val data: T?, val resourceError:ResourceError?) { + enum class Status { + SUCCESS, ERROR, LOADING + } + companion object { + fun success(data: T?): Resource { + return Resource(Status.SUCCESS, data, null) + } + fun error(resourceError: ResourceError?): Resource { + return Resource(Status.ERROR, null, resourceError) + } + fun loading(data: T?): Resource { + return Resource(Status.LOADING, data, null) + } + } +} \ No newline at end of file diff --git a/client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/ResourceError.kt b/client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/ResourceError.kt new file mode 100644 index 0000000..6ba4876 --- /dev/null +++ b/client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/ResourceError.kt @@ -0,0 +1,5 @@ +package com.ssafy.smartstore.service + +class ResourceError { + var error: Error? = null +} \ No newline at end of file diff --git a/client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/UserService.kt b/client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/UserService.kt index 5d106ce..35342b9 100644 --- a/client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/UserService.kt +++ b/client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/UserService.kt @@ -1,6 +1,5 @@ package com.ssafy.smartstore.service -import android.util.Log import com.ssafy.smartstore.dto.User import com.ssafy.smartstore.util.RetrofitCallback import com.ssafy.smartstore.util.RetrofitUtil @@ -11,7 +10,6 @@ import retrofit2.Response private const val TAG = "LoginService_싸피" class UserService { - fun login(user: User, callback: RetrofitCallback) { RetrofitUtil.userService.login(user).enqueue(object : Callback { override fun onResponse(call: Call, response: Response) { @@ -76,3 +74,4 @@ class UserService { } } + From 448b36e6cd616031f0369452c84b4ddc03f4bec3 Mon Sep 17 00:00:00 2001 From: bigyoung8375 Date: Thu, 17 Nov 2022 17:55:48 +0900 Subject: [PATCH 2/2] 2022-11-17 17:55 -> retrofit callback add --- .../main/java/com/ssafy/smartstore/service/UserService.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/UserService.kt b/client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/UserService.kt index 35342b9..83db5ad 100644 --- a/client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/UserService.kt +++ b/client/smartstore_project_jetpack/app/src/main/java/com/ssafy/smartstore/service/UserService.kt @@ -27,9 +27,16 @@ class UserService { callback.onError(t) } }) + + + RetrofitUtil.userService.login(user).enqueue(CustomCallback() { + + }) + } + fun getId(id: String, callback: RetrofitCallback) { RetrofitUtil.userService.isUsedId(id).enqueue(object : Callback { override fun onResponse(call: Call, response: Response) {