#272 [FIX] collect 중복 호출 케이스 체크

team-MUMENT · Jul 16, 2023 · 6c41541 · 6c41541
1 parent 63c2ba3
commit 6c41541
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 61 deletions.
diff --git a/feature/login/src/main/java/com/mument_android/login/LogInActivity.kt b/feature/login/src/main/java/com/mument_android/login/LogInActivity.kt
@@ -48,9 +48,26 @@ class LogInActivity : BaseActivity<ActivityLogInBinding>(ActivityLogInBinding::i
         btnKakaoListener()
         getFcmToken()
         webLinkNetwork()
+        collectData()
         //keyClipBoard()
     }
 
+    private fun collectData() {
+        collectFlowWhenStarted(viewModel.isExist){
+            if (it==true) {
+                moveToMainActivity()
+            } else if (it==false) {
+                //카카오 회원가입 누를 때 GA
+                FirebaseAnalyticsUtil.firebaseLog(
+                    "signup_process",
+                    "journey",
+                    "signup_sns_login_kakao"
+                )
+                startActivity(Intent(this, ProfileSettingActivity::class.java))
+            }
+        }
+    }
+
     /*
     private fun keyClipBoard() {
         var keyHash = Utility.getKeyHash(this)
@@ -140,22 +157,6 @@ class LogInActivity : BaseActivity<ActivityLogInBinding>(ActivityLogInBinding::i
                         viewModel.fcmToken.value!!
                     )
                     viewModel.kakaoLogin(requestKakaoData)
-                    collectFlowWhenStarted(viewModel.isExist){
-                        Log.e("isExist", it.toString())
-                        if (it==true) {
-                            Log.e("isExist True", it.toString())
-                            moveToMainActivity()
-                        } else if (it==false) {
-                            //카카오 회원가입 누를 때 GA
-                            FirebaseAnalyticsUtil.firebaseLog(
-                                "signup_process",
-                                "journey",
-                                "signup_sns_login_kakao"
-                            )
-                            Log.e("isExist False", it.toString())
-                            startActivity(Intent(this, ProfileSettingActivity::class.java))
-                        }
-                    }
                 }
             } else {
                 shortToast("else")

diff --git a/feature/login/src/main/java/com/mument_android/onboarding/OnBoardingActivity.kt b/feature/login/src/main/java/com/mument_android/onboarding/OnBoardingActivity.kt
@@ -1,18 +1,12 @@
 package com.mument_android.onboarding
 
 import android.os.Bundle
-import androidx.activity.viewModels
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.mument_android.core_dependent.base.BaseActivity
-import com.mument_android.core_dependent.ext.DataStoreManager
-import com.mument_android.core_dependent.ext.collectFlow
-import com.mument_android.core_dependent.ext.collectFlowWhenStarted
-import com.mument_android.login.LogInViewModel
 import com.mument_android.login.databinding.ActivityOnBoardingBinding
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class OnBoardingActivity :

diff --git a/feature/mypage/src/main/java/com/mument_android/mypage/MyPageViewModel.kt b/feature/mypage/src/main/java/com/mument_android/mypage/MyPageViewModel.kt
@@ -7,7 +7,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.mument_android.core.network.ApiResult
 import com.mument_android.core_dependent.ext.DataStoreManager
-import com.mument_android.core_dependent.ext.collectFlowWhenStarted
 import com.mument_android.domain.entity.mypage.*
 import com.mument_android.domain.entity.sign.WebViewEntity
 import com.mument_android.domain.usecase.mypage.*

diff --git a/feature/record/src/main/java/com/mument_android/record/RecordActivity.kt b/feature/record/src/main/java/com/mument_android/record/RecordActivity.kt
@@ -336,52 +336,52 @@ class RecordActivity :
 
     //완료버튼 눌렀을 때
     private fun getAllData() {
-        binding.tvRecordFinish.setOnSingleClickListener {
-            if (recordViewModel.mumentId.value == "") {
-                recordViewModel.postMument()
-            } else {
-                recordViewModel.modifyMument()
-            }
-
-            collectFlowWhenStarted(recordViewModel.isCreateSuccessful) { isSuccessful ->
-                if (isSuccessful) {
-                    val mumentId = recordViewModel.createdMumentId.value ?: ""
-                    recordViewModel.selectedMusic.value?.let { music ->
-                        Intent().run {
-                            putExtra(TO_MUSIC_DETAIL, TO_MUSIC_DETAIL)
-                            putExtra(MUMENT_ID, mumentId)
-                            putExtra(MUSIC_INFO_ENTITY, music.toMusicInfo())
-                            when (recordViewModel.recordCount) {
-                                1, 10, 20 -> {
-                                    putExtra("COUNT", true)
-                                }
+        collectFlowWhenStarted(recordViewModel.isCreateSuccessful) { isSuccessful ->
+            if (isSuccessful) {
+                val mumentId = recordViewModel.createdMumentId.value ?: ""
+                recordViewModel.selectedMusic.value?.let { music ->
+                    Intent().run {
+                        putExtra(TO_MUSIC_DETAIL, TO_MUSIC_DETAIL)
+                        putExtra(MUMENT_ID, mumentId)
+                        putExtra(MUSIC_INFO_ENTITY, music.toMusicInfo())
+                        when (recordViewModel.recordCount) {
+                            1, 10, 20 -> {
+                                putExtra("COUNT", true)
                             }
-                            putExtra("RECORD", recordViewModel.mumentId.value == "")
-                            setResult(RESULT_OK, this)
-                            delay(500)
-                            finish()
                         }
+                        putExtra("RECORD", recordViewModel.mumentId.value == "")
+                        setResult(RESULT_OK, this)
+                        delay(500)
+                        finish()
                     }
-                } else {
-                    showToast("뮤멘트 기록하기 실패")
                 }
+            } else {
+                showToast("뮤멘트 기록하기 실패")
             }
+        }
 
-            collectFlowWhenStarted(recordViewModel.isModifySuccessful) { isSuccessful ->
-                if (isSuccessful) {
-                    val mumentId = recordViewModel.modifyMumentId.value ?: ""
-                    recordViewModel.selectedMusic.value?.toMusicInfo()?.let { music ->
-                        Intent().run {
-                            putExtra(TO_MUMENT_DETAIL, TO_MUMENT_DETAIL)
-                            putExtra(MUMENT_ID, mumentId)
-                            putExtra(MUSIC_INFO_ENTITY, music)
-                            setResult(RESULT_OK, this)
-                            finish()
-                        }
+        collectFlowWhenStarted(recordViewModel.isModifySuccessful) { isSuccessful ->
+            if (isSuccessful) {
+                val mumentId = recordViewModel.modifyMumentId.value ?: ""
+                recordViewModel.selectedMusic.value?.toMusicInfo()?.let { music ->
+                    Intent().run {
+                        putExtra(TO_MUMENT_DETAIL, TO_MUMENT_DETAIL)
+                        putExtra(MUMENT_ID, mumentId)
+                        putExtra(MUSIC_INFO_ENTITY, music)
+                        setResult(RESULT_OK, this)
+                        finish()
                     }
-                } else {
-                    showToast("뮤멘트 수정하기 실패")
                 }
+            } else {
+                showToast("뮤멘트 수정하기 실패")
+            }
+        }
+
+        binding.tvRecordFinish.setOnSingleClickListener {
+            if (recordViewModel.mumentId.value == "") {
+                recordViewModel.postMument()
+            } else {
+                recordViewModel.modifyMument()
             }
         }
     }