From d0ea1501c43b136a04ec9a27cee3d7a024b482d5 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 19 Sep 2024 03:40:04 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[FIX/#137]=20=EC=95=8C=EB=A6=BC=EB=B7=B0=20?= =?UTF-8?q?=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/co/orange/main/main/home/HomeFragment.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/feature/main/src/main/java/co/orange/main/main/home/HomeFragment.kt b/feature/main/src/main/java/co/orange/main/main/home/HomeFragment.kt index 438fec78..fcffd3cd 100644 --- a/feature/main/src/main/java/co/orange/main/main/home/HomeFragment.kt +++ b/feature/main/src/main/java/co/orange/main/main/home/HomeFragment.kt @@ -128,7 +128,11 @@ class HomeFragment() : BaseFragment(featureR.layout.fragmen private fun initAlarmBtnListener() { binding.btnAlarm.setOnSingleClickListener { - startActivity(Intent(requireContext(), AlarmActivity::class.java)) + if (viewModel.getUserLogined()) { + startActivity(Intent(requireContext(), AlarmActivity::class.java)) + } else { + navigationManager.toLoginView(requireContext(), "sell") + } } } From f74f2d791502aad877e3a18435ca3cb4a5e6b81d Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 19 Sep 2024 03:41:40 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[CHORE/#137]=20version=20code=208=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildSrc/src/main/kotlin/Constants.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt index ef50ce2e..f9096fac 100644 --- a/buildSrc/src/main/kotlin/Constants.kt +++ b/buildSrc/src/main/kotlin/Constants.kt @@ -3,6 +3,6 @@ object Constants { const val compileSdk = 34 const val minSdk = 28 const val targetSdk = 34 - const val versionCode = 7 + const val versionCode = 8 const val versionName = "1.1.1" } From 8004d806b1021779f3f628391cde35bc05ccc207 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 19 Sep 2024 03:48:42 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[FIX/#137]=20OCR=20=EA=B2=B0=EA=B3=BC?= =?UTF-8?q?=EA=B0=92=20=EC=98=A4=EB=A5=98=20=EB=B6=84=EA=B8=B0=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sell/onboarding/SellOnboardingViewModel.kt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/feature/sell/src/main/java/co/orange/sell/onboarding/SellOnboardingViewModel.kt b/feature/sell/src/main/java/co/orange/sell/onboarding/SellOnboardingViewModel.kt index 780f342b..d87ccb8a 100644 --- a/feature/sell/src/main/java/co/orange/sell/onboarding/SellOnboardingViewModel.kt +++ b/feature/sell/src/main/java/co/orange/sell/onboarding/SellOnboardingViewModel.kt @@ -80,10 +80,14 @@ class SellOnboardingViewModel viewModelScope.launch { sellRepository.postToCheckProduct(SellCheckRequestModel(uploadedUrl)) .onSuccess { - productId = it.productId - productName = it.productName - productImage = it.imgUrl - _changingImageState.value = UiState.Success(it.productId) + if (it.productId.isNotEmpty()) { + productId = it.productId + productName = it.productName + productImage = it.imgUrl + _changingImageState.value = UiState.Success(it.productId) + } else { + _changingImageState.value = UiState.Failure(it.productId) + } } .onFailure { _changingImageState.value = UiState.Failure(it.message.toString())