feat(auth): 여덟 인증 진입점에 콘텐츠 설정을 연결한다
This commit is contained in:
+6
-11
@@ -30,7 +30,6 @@ import coil.transform.CircleCropTransformation
|
|||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import com.bumptech.glide.Glide
|
import com.bumptech.glide.Glide
|
||||||
import com.bumptech.glide.request.RequestOptions
|
import com.bumptech.glide.request.RequestOptions
|
||||||
import com.google.gson.Gson
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService
|
import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService
|
||||||
import kr.co.vividnext.sodalive.audio_content.PurchaseOption
|
import kr.co.vividnext.sodalive.audio_content.PurchaseOption
|
||||||
@@ -52,9 +51,7 @@ import kr.co.vividnext.sodalive.explorer.profile.CreatorFollowNotifyFragment
|
|||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
import kr.co.vividnext.sodalive.extensions.moneyFormat
|
import kr.co.vividnext.sodalive.extensions.moneyFormat
|
||||||
import kr.co.vividnext.sodalive.live.room.donation.LiveRoomDonationDialog
|
import kr.co.vividnext.sodalive.live.room.donation.LiveRoomDonationDialog
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.Auth
|
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse
|
|
||||||
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
|
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.can.payment.CanPaymentTempActivity
|
import kr.co.vividnext.sodalive.mypage.can.payment.CanPaymentTempActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.recent.RecentContentViewModel
|
import kr.co.vividnext.sodalive.mypage.recent.RecentContentViewModel
|
||||||
@@ -118,6 +115,10 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
|
|||||||
audioContentId = intent.getLongExtra(Constants.EXTRA_AUDIO_CONTENT_ID, 0)
|
audioContentId = intent.getLongExtra(Constants.EXTRA_AUDIO_CONTENT_ID, 0)
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
|
supportFragmentManager.setFragmentResultListener(V2AuthFlow.AUDIO_AUTH_COMPLETED, this) { _, _ ->
|
||||||
|
viewModel.getAudioContentDetail(audioContentId = audioContentId)
|
||||||
|
}
|
||||||
|
|
||||||
imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
|
imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
|
||||||
|
|
||||||
if (audioContentId <= 0) {
|
if (audioContentId <= 0) {
|
||||||
@@ -1056,13 +1057,7 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
|
|||||||
binding.llAlert19.visibility = View.VISIBLE
|
binding.llAlert19.visibility = View.VISIBLE
|
||||||
|
|
||||||
binding.tvAuth.setOnClickListener {
|
binding.tvAuth.setOnClickListener {
|
||||||
Auth.auth(this, applicationContext) { data ->
|
V2AuthFlow.start(this, syncMemberInfo = true)
|
||||||
val bootpayResponse = Gson().fromJson(data, BootpayResponse::class.java)
|
|
||||||
val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)
|
|
||||||
runOnUiThread {
|
|
||||||
viewModel.authVerify(audioContentId = audioContentId, request = request)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
binding.alert19Bg.visibility = View.GONE
|
binding.alert19Bg.visibility = View.GONE
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ import androidx.media3.common.util.UnstableApi
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.google.gson.Gson
|
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
import com.yandex.mobile.ads.banner.BannerAdSize
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
import com.yandex.mobile.ads.common.AdRequest
|
||||||
import com.zhpan.bannerview.BaseBannerAdapter
|
import com.zhpan.bannerview.BaseBannerAdapter
|
||||||
@@ -34,11 +33,8 @@ import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
|||||||
import kr.co.vividnext.sodalive.databinding.FragmentCharacterTabBinding
|
import kr.co.vividnext.sodalive.databinding.FragmentCharacterTabBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
import kr.co.vividnext.sodalive.main.MainActivity
|
import kr.co.vividnext.sodalive.main.MainActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.MyPageViewModel
|
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.Auth
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
|
||||||
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
||||||
import kr.co.vividnext.sodalive.splash.SplashActivity
|
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import kotlin.math.roundToInt
|
import kotlin.math.roundToInt
|
||||||
|
|
||||||
@@ -48,7 +44,6 @@ class CharacterTabFragment : BaseFragment<FragmentCharacterTabBinding>(
|
|||||||
FragmentCharacterTabBinding::inflate
|
FragmentCharacterTabBinding::inflate
|
||||||
) {
|
) {
|
||||||
private val viewModel: CharacterTabViewModel by inject()
|
private val viewModel: CharacterTabViewModel by inject()
|
||||||
private val myPageViewModel: MyPageViewModel by inject()
|
|
||||||
|
|
||||||
private lateinit var contentBannerAdapter: CharacterBannerAdapter
|
private lateinit var contentBannerAdapter: CharacterBannerAdapter
|
||||||
private lateinit var recentCharacterAdapter: RecentCharacterAdapter
|
private lateinit var recentCharacterAdapter: RecentCharacterAdapter
|
||||||
@@ -437,29 +432,7 @@ class CharacterTabFragment : BaseFragment<FragmentCharacterTabBinding>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun startAuthFlow() {
|
private fun startAuthFlow() {
|
||||||
Auth.auth(requireActivity(), requireContext()) { json ->
|
V2AuthFlow.start(requireActivity())
|
||||||
val bootpayResponse = Gson().fromJson(
|
|
||||||
json,
|
|
||||||
kr.co.vividnext.sodalive.mypage.auth.BootpayResponse::class.java
|
|
||||||
)
|
|
||||||
val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)
|
|
||||||
requireActivity().runOnUiThread {
|
|
||||||
myPageViewModel.authVerify(request) {
|
|
||||||
startActivity(
|
|
||||||
Intent(
|
|
||||||
requireContext(),
|
|
||||||
SplashActivity::class.java
|
|
||||||
).apply {
|
|
||||||
addFlags(
|
|
||||||
Intent.FLAG_ACTIVITY_CLEAR_TASK or
|
|
||||||
Intent.FLAG_ACTIVITY_NEW_TASK
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
requireActivity().finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun observeViewModel() {
|
private fun observeViewModel() {
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import androidx.media3.common.util.UnstableApi
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.google.gson.Gson
|
|
||||||
import androidx.recyclerview.widget.ConcatAdapter
|
import androidx.recyclerview.widget.ConcatAdapter
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
import kr.co.vividnext.sodalive.BuildConfig
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
@@ -24,11 +23,7 @@ import kr.co.vividnext.sodalive.common.YandexInlineBannerHeaderAdapter
|
|||||||
import kr.co.vividnext.sodalive.databinding.FragmentOriginalTabBinding
|
import kr.co.vividnext.sodalive.databinding.FragmentOriginalTabBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
import kr.co.vividnext.sodalive.main.MainActivity
|
import kr.co.vividnext.sodalive.main.MainActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.MyPageViewModel
|
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.Auth
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse
|
|
||||||
import kr.co.vividnext.sodalive.splash.SplashActivity
|
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
|
|
||||||
@OptIn(UnstableApi::class)
|
@OptIn(UnstableApi::class)
|
||||||
@@ -36,7 +31,6 @@ class OriginalTabFragment :
|
|||||||
BaseFragment<FragmentOriginalTabBinding>(FragmentOriginalTabBinding::inflate) {
|
BaseFragment<FragmentOriginalTabBinding>(FragmentOriginalTabBinding::inflate) {
|
||||||
|
|
||||||
private val viewModel: OriginalWorkViewModel by inject()
|
private val viewModel: OriginalWorkViewModel by inject()
|
||||||
private val myPageViewModel: MyPageViewModel by inject()
|
|
||||||
|
|
||||||
private lateinit var adapter: OriginalWorkListAdapter
|
private lateinit var adapter: OriginalWorkListAdapter
|
||||||
private lateinit var bannerAdapter: YandexInlineBannerHeaderAdapter
|
private lateinit var bannerAdapter: YandexInlineBannerHeaderAdapter
|
||||||
@@ -158,28 +152,6 @@ class OriginalTabFragment :
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun startAuthFlow() {
|
private fun startAuthFlow() {
|
||||||
Auth.auth(requireActivity(), requireContext()) { json ->
|
V2AuthFlow.start(requireActivity())
|
||||||
val bootpayResponse = Gson().fromJson(
|
|
||||||
json,
|
|
||||||
BootpayResponse::class.java
|
|
||||||
)
|
|
||||||
val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)
|
|
||||||
requireActivity().runOnUiThread {
|
|
||||||
myPageViewModel.authVerify(request) {
|
|
||||||
startActivity(
|
|
||||||
Intent(
|
|
||||||
requireContext(),
|
|
||||||
SplashActivity::class.java
|
|
||||||
).apply {
|
|
||||||
addFlags(
|
|
||||||
Intent.FLAG_ACTIVITY_CLEAR_TASK or
|
|
||||||
Intent.FLAG_ACTIVITY_NEW_TASK
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
requireActivity().finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ import androidx.media3.common.util.UnstableApi
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.google.gson.Gson
|
|
||||||
import com.zhpan.bannerview.BaseBannerAdapter
|
import com.zhpan.bannerview.BaseBannerAdapter
|
||||||
import com.zhpan.indicator.enums.IndicatorSlideMode
|
import com.zhpan.indicator.enums.IndicatorSlideMode
|
||||||
import com.zhpan.indicator.enums.IndicatorStyle
|
import com.zhpan.indicator.enums.IndicatorStyle
|
||||||
@@ -53,10 +52,7 @@ import kr.co.vividnext.sodalive.live.room.detail.LiveRoomDetailFragment
|
|||||||
import kr.co.vividnext.sodalive.live.room.dialog.LivePaymentDialog
|
import kr.co.vividnext.sodalive.live.room.dialog.LivePaymentDialog
|
||||||
import kr.co.vividnext.sodalive.live.room.dialog.LiveRoomPasswordDialog
|
import kr.co.vividnext.sodalive.live.room.dialog.LiveRoomPasswordDialog
|
||||||
import kr.co.vividnext.sodalive.main.MainActivity
|
import kr.co.vividnext.sodalive.main.MainActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.MyPageViewModel
|
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.Auth
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse
|
|
||||||
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
|
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
|
||||||
import kr.co.vividnext.sodalive.search.SearchActivity
|
import kr.co.vividnext.sodalive.search.SearchActivity
|
||||||
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
||||||
@@ -64,7 +60,6 @@ import kr.co.vividnext.sodalive.settings.event.EventDetailActivity
|
|||||||
import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
||||||
import kr.co.vividnext.sodalive.settings.language.LocaleHelper
|
import kr.co.vividnext.sodalive.settings.language.LocaleHelper
|
||||||
import kr.co.vividnext.sodalive.settings.notification.MemberRole
|
import kr.co.vividnext.sodalive.settings.notification.MemberRole
|
||||||
import kr.co.vividnext.sodalive.splash.SplashActivity
|
|
||||||
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity
|
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
@@ -78,7 +73,6 @@ import kotlinx.coroutines.launch
|
|||||||
class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::inflate) {
|
class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::inflate) {
|
||||||
private val viewModel: HomeViewModel by inject()
|
private val viewModel: HomeViewModel by inject()
|
||||||
private val liveViewModel: LiveViewModel by inject()
|
private val liveViewModel: LiveViewModel by inject()
|
||||||
private val myPageViewModel: MyPageViewModel by inject()
|
|
||||||
|
|
||||||
private lateinit var loadingDialog: LoadingDialog
|
private lateinit var loadingDialog: LoadingDialog
|
||||||
|
|
||||||
@@ -1368,29 +1362,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun startAuthFlow() {
|
private fun startAuthFlow() {
|
||||||
Auth.auth(requireActivity(), requireContext()) { json ->
|
V2AuthFlow.start(requireActivity())
|
||||||
val bootpayResponse = Gson().fromJson(
|
|
||||||
json,
|
|
||||||
BootpayResponse::class.java
|
|
||||||
)
|
|
||||||
val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)
|
|
||||||
requireActivity().runOnUiThread {
|
|
||||||
myPageViewModel.authVerify(request) {
|
|
||||||
startActivity(
|
|
||||||
Intent(
|
|
||||||
requireContext(),
|
|
||||||
SplashActivity::class.java
|
|
||||||
).apply {
|
|
||||||
addFlags(
|
|
||||||
Intent.FLAG_ACTIVITY_CLEAR_TASK or
|
|
||||||
Intent.FLAG_ACTIVITY_NEW_TASK
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
requireActivity().finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun onCharacterClick(characterId: Long) {
|
private fun onCharacterClick(characterId: Long) {
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ import androidx.media3.common.util.UnstableApi
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.google.gson.Gson
|
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
import com.yandex.mobile.ads.banner.BannerAdSize
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
import com.yandex.mobile.ads.common.AdRequest
|
||||||
import com.zhpan.bannerview.BaseBannerAdapter
|
import com.zhpan.bannerview.BaseBannerAdapter
|
||||||
@@ -61,17 +60,13 @@ import kr.co.vividnext.sodalive.live.room.dialog.LiveRoomPasswordDialog
|
|||||||
import kr.co.vividnext.sodalive.live.room.update.LiveRoomEditActivity
|
import kr.co.vividnext.sodalive.live.room.update.LiveRoomEditActivity
|
||||||
import kr.co.vividnext.sodalive.main.MainActivity
|
import kr.co.vividnext.sodalive.main.MainActivity
|
||||||
import kr.co.vividnext.sodalive.message.MessageActivity
|
import kr.co.vividnext.sodalive.message.MessageActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.MyPageViewModel
|
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.Auth
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse
|
|
||||||
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
|
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
|
||||||
import kr.co.vividnext.sodalive.search.SearchActivity
|
import kr.co.vividnext.sodalive.search.SearchActivity
|
||||||
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
||||||
import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
||||||
import kr.co.vividnext.sodalive.settings.language.LocaleHelper
|
import kr.co.vividnext.sodalive.settings.language.LocaleHelper
|
||||||
import kr.co.vividnext.sodalive.settings.notification.MemberRole
|
import kr.co.vividnext.sodalive.settings.notification.MemberRole
|
||||||
import kr.co.vividnext.sodalive.splash.SplashActivity
|
|
||||||
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity
|
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
@@ -85,7 +80,6 @@ import kotlin.math.roundToInt
|
|||||||
@UnstableApi
|
@UnstableApi
|
||||||
class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::inflate) {
|
class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::inflate) {
|
||||||
private val viewModel: LiveViewModel by inject()
|
private val viewModel: LiveViewModel by inject()
|
||||||
private val myPageViewModel: MyPageViewModel by inject()
|
|
||||||
|
|
||||||
private lateinit var liveNowAdapter: LiveNowAdapter
|
private lateinit var liveNowAdapter: LiveNowAdapter
|
||||||
private lateinit var liveReservationAdapter: LiveReservationAdapter
|
private lateinit var liveReservationAdapter: LiveReservationAdapter
|
||||||
@@ -911,29 +905,7 @@ class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::infl
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun startAuthFlow() {
|
private fun startAuthFlow() {
|
||||||
Auth.auth(requireActivity(), requireContext()) { json ->
|
V2AuthFlow.start(requireActivity())
|
||||||
val bootpayResponse = Gson().fromJson(
|
|
||||||
json,
|
|
||||||
BootpayResponse::class.java
|
|
||||||
)
|
|
||||||
val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)
|
|
||||||
requireActivity().runOnUiThread {
|
|
||||||
myPageViewModel.authVerify(request) {
|
|
||||||
startActivity(
|
|
||||||
Intent(
|
|
||||||
requireContext(),
|
|
||||||
SplashActivity::class.java
|
|
||||||
).apply {
|
|
||||||
addFlags(
|
|
||||||
Intent.FLAG_ACTIVITY_CLEAR_TASK or
|
|
||||||
Intent.FLAG_ACTIVITY_NEW_TASK
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
requireActivity().finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@UnstableApi
|
@UnstableApi
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import androidx.media3.common.util.UnstableApi
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.google.gson.Gson
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService
|
import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService
|
||||||
import kr.co.vividnext.sodalive.audio_content.player.AudioContentPlayerService
|
import kr.co.vividnext.sodalive.audio_content.player.AudioContentPlayerService
|
||||||
@@ -27,14 +26,10 @@ import kr.co.vividnext.sodalive.live.room.LiveRoomActivity
|
|||||||
import kr.co.vividnext.sodalive.live.room.detail.LiveRoomDetailFragment
|
import kr.co.vividnext.sodalive.live.room.detail.LiveRoomDetailFragment
|
||||||
import kr.co.vividnext.sodalive.live.room.dialog.LivePaymentDialog
|
import kr.co.vividnext.sodalive.live.room.dialog.LivePaymentDialog
|
||||||
import kr.co.vividnext.sodalive.live.room.dialog.LiveRoomPasswordDialog
|
import kr.co.vividnext.sodalive.live.room.dialog.LiveRoomPasswordDialog
|
||||||
import kr.co.vividnext.sodalive.mypage.MyPageViewModel
|
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.Auth
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse
|
|
||||||
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
||||||
import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
||||||
import kr.co.vividnext.sodalive.settings.language.LocaleHelper
|
import kr.co.vividnext.sodalive.settings.language.LocaleHelper
|
||||||
import kr.co.vividnext.sodalive.splash.SplashActivity
|
|
||||||
import kr.co.vividnext.sodalive.user.login.LoginActivity
|
import kr.co.vividnext.sodalive.user.login.LoginActivity
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
@@ -47,7 +42,6 @@ class LiveNowAllActivity : BaseActivity<ActivityLiveNowAllBinding>(
|
|||||||
ActivityLiveNowAllBinding::inflate
|
ActivityLiveNowAllBinding::inflate
|
||||||
) {
|
) {
|
||||||
private val viewModel: LiveViewModel by inject()
|
private val viewModel: LiveViewModel by inject()
|
||||||
private val myPageViewModel: MyPageViewModel by inject()
|
|
||||||
|
|
||||||
private lateinit var adapter: LiveNowAllAdapter
|
private lateinit var adapter: LiveNowAllAdapter
|
||||||
private lateinit var loadingDialog: LoadingDialog
|
private lateinit var loadingDialog: LoadingDialog
|
||||||
@@ -163,29 +157,7 @@ class LiveNowAllActivity : BaseActivity<ActivityLiveNowAllBinding>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun startAuthFlow() {
|
private fun startAuthFlow() {
|
||||||
Auth.auth(this, applicationContext) { json ->
|
V2AuthFlow.start(this)
|
||||||
val bootpayResponse = Gson().fromJson(
|
|
||||||
json,
|
|
||||||
BootpayResponse::class.java
|
|
||||||
)
|
|
||||||
val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)
|
|
||||||
runOnUiThread {
|
|
||||||
myPageViewModel.authVerify(request) {
|
|
||||||
startActivity(
|
|
||||||
Intent(
|
|
||||||
applicationContext,
|
|
||||||
SplashActivity::class.java
|
|
||||||
).apply {
|
|
||||||
addFlags(
|
|
||||||
Intent.FLAG_ACTIVITY_CLEAR_TASK or
|
|
||||||
Intent.FLAG_ACTIVITY_NEW_TASK
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun enterLiveRoom(roomId: Long) {
|
private fun enterLiveRoom(roomId: Long) {
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import coil.load
|
import coil.load
|
||||||
import coil.transform.CircleCropTransformation
|
import coil.transform.CircleCropTransformation
|
||||||
import com.google.gson.Gson
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.audio_content.box.AudioContentBoxActivity
|
import kr.co.vividnext.sodalive.audio_content.box.AudioContentBoxActivity
|
||||||
import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
|
import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
|
||||||
@@ -29,9 +28,7 @@ import kr.co.vividnext.sodalive.extensions.dpToPx
|
|||||||
import kr.co.vividnext.sodalive.extensions.moneyFormat
|
import kr.co.vividnext.sodalive.extensions.moneyFormat
|
||||||
import kr.co.vividnext.sodalive.main.MainActivity
|
import kr.co.vividnext.sodalive.main.MainActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.alarm.AlarmListActivity
|
import kr.co.vividnext.sodalive.mypage.alarm.AlarmListActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.Auth
|
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse
|
|
||||||
import kr.co.vividnext.sodalive.mypage.block.BlockMemberActivity
|
import kr.co.vividnext.sodalive.mypage.block.BlockMemberActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
|
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.can.coupon.CanCouponActivity
|
import kr.co.vividnext.sodalive.mypage.can.coupon.CanCouponActivity
|
||||||
@@ -49,7 +46,6 @@ import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
|||||||
import kr.co.vividnext.sodalive.settings.notice.NoticeActivity
|
import kr.co.vividnext.sodalive.settings.notice.NoticeActivity
|
||||||
import kr.co.vividnext.sodalive.settings.notice.NoticeDetailActivity
|
import kr.co.vividnext.sodalive.settings.notice.NoticeDetailActivity
|
||||||
import kr.co.vividnext.sodalive.settings.notification.MemberRole
|
import kr.co.vividnext.sodalive.settings.notification.MemberRole
|
||||||
import kr.co.vividnext.sodalive.splash.SplashActivity
|
|
||||||
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity
|
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity
|
||||||
import kr.co.vividnext.sodalive.v2.gift.GiftInboxActivity
|
import kr.co.vividnext.sodalive.v2.gift.GiftInboxActivity
|
||||||
import kr.co.vividnext.sodalive.v2.gift.GiftInboxEntryPolicy
|
import kr.co.vividnext.sodalive.v2.gift.GiftInboxEntryPolicy
|
||||||
@@ -488,29 +484,7 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun showAuthDialog() {
|
private fun showAuthDialog() {
|
||||||
Auth.auth(requireActivity(), requireContext()) { json ->
|
V2AuthFlow.start(requireActivity())
|
||||||
val bootpayResponse = Gson().fromJson(
|
|
||||||
json,
|
|
||||||
BootpayResponse::class.java
|
|
||||||
)
|
|
||||||
val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)
|
|
||||||
requireActivity().runOnUiThread {
|
|
||||||
viewModel.authVerify(request) {
|
|
||||||
startActivity(
|
|
||||||
Intent(
|
|
||||||
requireContext(),
|
|
||||||
SplashActivity::class.java
|
|
||||||
).apply {
|
|
||||||
addFlags(
|
|
||||||
Intent.FLAG_ACTIVITY_CLEAR_TASK or
|
|
||||||
Intent.FLAG_ACTIVITY_NEW_TASK
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
requireActivity().finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun showLoginActivity() {
|
private fun showLoginActivity() {
|
||||||
|
|||||||
@@ -3,18 +3,12 @@ package kr.co.vividnext.sodalive.v2.access
|
|||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import com.google.gson.Gson
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.common.Constants
|
import kr.co.vividnext.sodalive.common.Constants
|
||||||
import kr.co.vividnext.sodalive.mypage.MyPageViewModel
|
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.Auth
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
|
||||||
import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse
|
|
||||||
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
||||||
import kr.co.vividnext.sodalive.splash.SplashActivity
|
|
||||||
import kr.co.vividnext.sodalive.user.login.LoginActivity
|
import kr.co.vividnext.sodalive.user.login.LoginActivity
|
||||||
import kr.co.vividnext.sodalive.v2.components.modal.V2ModalDialog
|
import kr.co.vividnext.sodalive.v2.components.modal.V2ModalDialog
|
||||||
import org.koin.android.ext.android.get
|
|
||||||
|
|
||||||
class V2AccessGuard(
|
class V2AccessGuard(
|
||||||
private val policy: AccessPolicy = AccessPolicy(),
|
private val policy: AccessPolicy = AccessPolicy(),
|
||||||
@@ -90,23 +84,7 @@ class V2AccessGuard(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun startAuthFlow(activity: Activity) {
|
private fun startAuthFlow(activity: Activity) {
|
||||||
val myPageViewModel: MyPageViewModel = activity.get()
|
V2AuthFlow.start(activity)
|
||||||
Auth.auth(activity, activity) { json ->
|
|
||||||
val bootpayResponse = Gson().fromJson(json, BootpayResponse::class.java)
|
|
||||||
val request = AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)
|
|
||||||
activity.runOnUiThread {
|
|
||||||
if (activity.isFinishing || activity.isDestroyed) return@runOnUiThread
|
|
||||||
myPageViewModel.authVerify(request) {
|
|
||||||
if (activity.isFinishing || activity.isDestroyed) return@authVerify
|
|
||||||
activity.startActivity(
|
|
||||||
Intent(activity, SplashActivity::class.java).apply {
|
|
||||||
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
activity.finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun startContentSettings(activity: Activity) {
|
private fun startContentSettings(activity: Activity) {
|
||||||
|
|||||||
+13
@@ -2,12 +2,25 @@
|
|||||||
|
|
||||||
package kr.co.vividnext.sodalive.audio_content.detail
|
package kr.co.vividnext.sodalive.audio_content.detail
|
||||||
|
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
import org.junit.Assert.assertTrue
|
import org.junit.Assert.assertTrue
|
||||||
import org.junit.Test
|
import org.junit.Test
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
class AudioContentDetailActivitySourceTest {
|
class AudioContentDetailActivitySourceTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `인증 완료 후 상세 재조회는 실패 종료 callback 없이 현재 화면을 유지한다`() {
|
||||||
|
val source = projectFile(
|
||||||
|
"app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt"
|
||||||
|
).readText()
|
||||||
|
val listener = source
|
||||||
|
.substringAfter("supportFragmentManager.setFragmentResultListener(V2AuthFlow.AUDIO_AUTH_COMPLETED, this) { _, _ ->")
|
||||||
|
.substringBefore("\n }")
|
||||||
|
|
||||||
|
assertEquals("viewModel.getAudioContentDetail(audioContentId = audioContentId)", listener.trim())
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `긴 설명을 펼치면 말줄임을 제거한다`() {
|
fun `긴 설명을 펼치면 말줄임을 제거한다`() {
|
||||||
val observer = expandDetailObserver()
|
val observer = expandDetailObserver()
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package kr.co.vividnext.sodalive.v2.main
|
package kr.co.vividnext.sodalive.v2.main
|
||||||
|
|
||||||
import org.junit.Assert.assertFalse
|
import org.junit.Assert.assertFalse
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
import org.junit.Assert.assertTrue
|
import org.junit.Assert.assertTrue
|
||||||
import org.junit.Test
|
import org.junit.Test
|
||||||
import java.io.File
|
import java.io.File
|
||||||
@@ -15,6 +16,7 @@ class MainV2LoginGuardSourceTest {
|
|||||||
val mainV2Activity = projectFile(
|
val mainV2Activity = projectFile(
|
||||||
"app/src/main/java/kr/co/vividnext/sodalive/v2/main/MainV2Activity.kt"
|
"app/src/main/java/kr/co/vividnext/sodalive/v2/main/MainV2Activity.kt"
|
||||||
).readText()
|
).readText()
|
||||||
|
val flow = projectFile("app/src/main/java/kr/co/vividnext/sodalive/v2/auth/V2AuthFlow.kt").readText()
|
||||||
val handleDecisionSource = source.substring(
|
val handleDecisionSource = source.substring(
|
||||||
source.indexOf("private fun handleDecision("),
|
source.indexOf("private fun handleDecision("),
|
||||||
source.indexOf("private fun startLoginActivity")
|
source.indexOf("private fun startLoginActivity")
|
||||||
@@ -35,13 +37,14 @@ class MainV2LoginGuardSourceTest {
|
|||||||
assertTrue(source.contains("Intent.FLAG_ACTIVITY_SINGLE_TOP"))
|
assertTrue(source.contains("Intent.FLAG_ACTIVITY_SINGLE_TOP"))
|
||||||
assertTrue(source.contains("V2ModalDialog("))
|
assertTrue(source.contains("V2ModalDialog("))
|
||||||
assertFalse(source.contains("SodaDialog("))
|
assertFalse(source.contains("SodaDialog("))
|
||||||
assertTrue(source.contains("Auth.auth(activity, activity)"))
|
assertTrue(source.contains("V2AuthFlow.start(activity)"))
|
||||||
assertTrue(source.contains("Gson().fromJson(json, BootpayResponse::class.java)"))
|
assertFalse(source.contains("AuthVerifyRequest("))
|
||||||
assertTrue(source.contains("AuthVerifyRequest(receiptId = bootpayResponse.data.receiptId)"))
|
assertFalse(source.contains("authVerify("))
|
||||||
assertTrue(source.contains("myPageViewModel.authVerify(request)"))
|
assertTrue(flow.contains("Auth.auth(host, host)"))
|
||||||
assertTrue(source.contains("if (activity.isFinishing || activity.isDestroyed)"))
|
assertTrue(flow.contains("validatedReceipt(payload)"))
|
||||||
assertTrue(source.contains("SplashActivity::class.java"))
|
assertTrue(flow.contains("it.isNotBlank()"))
|
||||||
assertTrue(source.contains("Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK"))
|
assertTrue(flow.contains("SplashActivity::class.java"))
|
||||||
|
assertTrue(flow.contains("Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK"))
|
||||||
assertTrue(source.contains("ContentSettingsActivity::class.java"))
|
assertTrue(source.contains("ContentSettingsActivity::class.java"))
|
||||||
assertTrue(source.contains("putExtra(Constants.EXTRA_SHOW_SENSITIVE_CONTENT_GUIDE, true)"))
|
assertTrue(source.contains("putExtra(Constants.EXTRA_SHOW_SENSITIVE_CONTENT_GUIDE, true)"))
|
||||||
assertFalse(source.contains("Auth.auth(activity, activity) {}"))
|
assertFalse(source.contains("Auth.auth(activity, activity) {}"))
|
||||||
@@ -54,6 +57,27 @@ class MainV2LoginGuardSourceTest {
|
|||||||
assertTrue(mainV2Activity.contains("ensureV2Access(AccessRequirement.Login)"))
|
assertTrue(mainV2Activity.contains("ensureV2Access(AccessRequirement.Login)"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `여덟 인증 진입점은 공통 흐름을 사용하고 오디오만 회원 동기화를 요청한다`() {
|
||||||
|
val callers = listOf(
|
||||||
|
"mypage/MyPageFragment.kt",
|
||||||
|
"home/HomeFragment.kt",
|
||||||
|
"live/LiveFragment.kt",
|
||||||
|
"live/now/all/LiveNowAllActivity.kt",
|
||||||
|
"chat/original/OriginalTabFragment.kt",
|
||||||
|
"chat/character/CharacterTabFragment.kt",
|
||||||
|
"audio_content/detail/AudioContentDetailActivity.kt",
|
||||||
|
"v2/access/V2AccessGuard.kt"
|
||||||
|
)
|
||||||
|
callers.forEach { path ->
|
||||||
|
val source = projectFile("app/src/main/java/kr/co/vividnext/sodalive/$path").readText()
|
||||||
|
assertTrue(path, source.contains("V2AuthFlow.start("))
|
||||||
|
assertFalse(path, source.contains("Auth.auth("))
|
||||||
|
assertFalse(path, source.contains("authVerify("))
|
||||||
|
assertEquals(path, path.startsWith("audio_content/"), source.contains("syncMemberInfo = true"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private fun projectFile(relativePath: String): File {
|
private fun projectFile(relativePath: String): File {
|
||||||
val candidates = listOf(File(relativePath), File("../$relativePath"))
|
val candidates = listOf(File(relativePath), File("../$relativePath"))
|
||||||
return candidates.firstOrNull { it.exists() }
|
return candidates.firstOrNull { it.exists() }
|
||||||
|
|||||||
Reference in New Issue
Block a user