[MERGE] #137 -> develop

[FIX/#137] OCR API 결과 분기처리
Orange-Co · Sep 18, 2024 · 97fa190 · 97fa190
2 parents 9264b90 + 8004d80
commit 97fa190
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git 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"
 }
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
@@ -128,7 +128,11 @@ class HomeFragment() : BaseFragment<FragmentHomeBinding>(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")
+            }
         }
     }
 

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
@@ -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())