diff --git a/app/src/main/java/com/example/nto_minipigs/Retrofit/ApiService.kt b/app/src/main/java/com/example/nto_minipigs/Retrofit/ApiService.kt index 5d7351b..d5df6c9 100644 --- a/app/src/main/java/com/example/nto_minipigs/Retrofit/ApiService.kt +++ b/app/src/main/java/com/example/nto_minipigs/Retrofit/ApiService.kt @@ -18,12 +18,12 @@ public interface ApiService { @GET("/api/{LOGIN}/auth") suspend fun auth(@Path("LOGIN") login: String): ResponseBody - @GET("/api/info") + @GET("/api/info/") suspend fun info(@Header("Authorization") token: String): Response - @PATCH("/api/open") - suspend fun open(@Header("Authorization") token: String, @Body data: Door): Response + @PATCH("/api/open/") + suspend fun open(@Header("Authorization") token: String, @Body data: Long): Response - @POST("/api/login") + @POST("/api/login/") suspend fun login(@Body data: Auth): Response } \ No newline at end of file diff --git a/app/src/main/java/com/example/nto_minipigs/Retrofit/Models/Door.kt b/app/src/main/java/com/example/nto_minipigs/Retrofit/Models/Door.kt index cd8f1d4..b17c9a2 100644 --- a/app/src/main/java/com/example/nto_minipigs/Retrofit/Models/Door.kt +++ b/app/src/main/java/com/example/nto_minipigs/Retrofit/Models/Door.kt @@ -1,5 +1,5 @@ package com.example.nto_minipigs.Retrofit.Models data class Door( - val id: String + val id: Long ) \ No newline at end of file diff --git a/app/src/main/java/com/example/nto_minipigs/ui/screens/QR/QRScreen.kt b/app/src/main/java/com/example/nto_minipigs/ui/screens/QR/QRScreen.kt index e601003..36180f6 100644 --- a/app/src/main/java/com/example/nto_minipigs/ui/screens/QR/QRScreen.kt +++ b/app/src/main/java/com/example/nto_minipigs/ui/screens/QR/QRScreen.kt @@ -46,7 +46,7 @@ fun QRScreen(navController: NavController, viewModel: QRViewModel, dataStore: Us scanFlag = true this.pause() - viewModel.Fetch(barCodeOrQr, login, password) + viewModel.Fetch(barCodeOrQr.toLong(), login, password) navController.navigate(QRResult) } //If you don't put this scanFlag = false, it will never work again. diff --git a/app/src/main/java/com/example/nto_minipigs/ui/screens/QR/QRViewModel.kt b/app/src/main/java/com/example/nto_minipigs/ui/screens/QR/QRViewModel.kt index 8365433..6c1c2ae 100644 --- a/app/src/main/java/com/example/nto_minipigs/ui/screens/QR/QRViewModel.kt +++ b/app/src/main/java/com/example/nto_minipigs/ui/screens/QR/QRViewModel.kt @@ -16,15 +16,14 @@ class QRViewModel: ViewModel() { private val _data = MutableLiveData>() val data : LiveData> = _data - fun Fetch(id: String, login:String, password:String) { + fun Fetch(id: Long, login:String, password:String) { _data.value = NetworkResponse.Loading viewModelScope.launch { if(id != null) { try { - val request = Door(id) var basic = Credentials.basic(login.toString(), password.toString()) - val response = serviceApi.open(basic, request) + val response = serviceApi.open(basic, id) if(response.isSuccessful) { response.body()?.let { _data.value = NetworkResponse.Success(it)