Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Jul 17, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 52 additions & 16 deletions feature/login/src/main/java/com/mument_android/login/LogInActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,61 @@ 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)
Log.e("kkkkkkkkkk:", "$keyHash")
binding.key.setText("$keyHash")
val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager

// 새로운 ClipData 객체로 데이터 복사하기
val clip: ClipData =
ClipData.newPlainText("simple text", binding.key.text.toString())

// 새로운 클립 객체를 클립보드에 배치합니다.
clipboard.setPrimaryClip(clip)

Toast.makeText(this, "복사 완료.", Toast.LENGTH_SHORT).show()
false

binding.key.setOnClickListener {
val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager

// 새로운 ClipData 객체로 데이터 복사하기
val clip: ClipData =
ClipData.newPlainText("simple text", binding.key.text.toString())

// 새로운 클립 객체를 클립보드에 배치합니다.
clipboard.setPrimaryClip(clip)

Toast.makeText(this, "복사 완료.", Toast.LENGTH_SHORT).show()
false
}
}

*/


private fun getFcmToken() {
FirebaseMessaging.getInstance().token.addOnCompleteListener(OnCompleteListener { task ->
if (!task.isSuccessful) { //기기 토큰 얻어오는 코드
Expand Down Expand Up @@ -105,22 +157,6 @@ class LogInActivity : BaseActivity<ActivityLogInBinding>(ActivityLogInBinding::i
viewModel.fcmToken.value!!
)
viewModel.kakaoLogin(requestKakaoData)
collectFlowWhenStarted(viewModel.isExist){
Log.e("isExist", it.toString())
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

여기서 만약에 null 이 떠서 아무 동작도 안하다가 다시 버튼 누르면 n개의 collect observer가 생김

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")
Expand Down
6 changes: 0 additions & 6 deletions feature/login/src/main/java/com/mument_android/onboarding/OnBoardingActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 :
Expand Down
1 change: 0 additions & 1 deletion feature/mypage/src/main/java/com/mument_android/mypage/MyPageViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
76 changes: 38 additions & 38 deletions feature/record/src/main/java/com/mument_android/record/RecordActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}
}
Expand Down
Loading