From 1a3396b2938a09e593be5966542ca257271914c4 Mon Sep 17 00:00:00 2001 From: klaus Date: Fri, 3 Nov 2023 20:37:34 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EA=B5=AC?= =?UTF-8?q?=EB=A7=A4=20-=20=EC=BA=94=EC=9D=B4=20=EB=B6=80=EC=A1=B1?= =?UTF-8?q?=ED=95=98=EB=A9=B4=20=EC=BA=94=20=EC=B6=A9=EC=A0=84=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=EB=A1=9C=20=EC=9D=B4=EB=8F=99=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../audio_content/detail/AudioContentDetailActivity.kt | 7 ++++++- .../audio_content/detail/AudioContentDetailViewModel.kt | 5 ++++- .../java/kr/co/vividnext/sodalive/common/Constants.kt | 2 +- .../sodalive/live/room/donation/LiveRoomDonationDialog.kt | 2 +- .../sodalive/mypage/can/charge/CanChargeActivity.kt | 8 ++++---- .../sodalive/mypage/can/payment/CanPaymentActivity.kt | 8 ++++---- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt index b344a97..4460139 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt @@ -40,6 +40,7 @@ import kr.co.vividnext.sodalive.live.room.donation.LiveRoomDonationDialog 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.report.ReportType import org.koin.android.ext.android.inject @@ -737,7 +738,11 @@ class AudioContentDetailActivity : BaseActivity Unit) { isLoading.value = true compositeDisposable.add( repository.orderContent( @@ -200,6 +200,9 @@ class AudioContentDetailViewModel( } else { if (it.message != null) { _toastLiveData.postValue(it.message) + if (it.message.contains("캔이 부족합니다")) { + gotoShop() + } } else { _toastLiveData.postValue( "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." diff --git a/app/src/main/java/kr/co/vividnext/sodalive/common/Constants.kt b/app/src/main/java/kr/co/vividnext/sodalive/common/Constants.kt index b73f866..e2f4d24 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/common/Constants.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/common/Constants.kt @@ -29,7 +29,7 @@ object Constants { const val EXTRA_MESSAGE_BOX = "extra_message_box" const val EXTRA_TEXT_MESSAGE = "extra_text_message" const val EXTRA_LIVE_TIME_NOW = "extra_live_time_now" - const val EXTRA_PREV_LIVE_ROOM = "extra_prev_live_room" + const val EXTRA_GO_TO_PREV_PAGE = "extra_go_to_prev_page" const val EXTRA_SELECT_RECIPIENT = "extra_select_recipient" const val EXTRA_ROOM_CHANNEL_NAME = "extra_room_channel_name" const val EXTRA_LIVE_RESERVATION_RESPONSE = "extra_live_reservation_response" diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt index 60ee2a5..2daaa81 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt @@ -108,7 +108,7 @@ class LiveRoomDonationDialog( bottomSheetDialog.dismiss() val intent = Intent(activity, CanChargeActivity::class.java) - intent.putExtra(Constants.EXTRA_PREV_LIVE_ROOM, true) + intent.putExtra(Constants.EXTRA_GO_TO_PREV_PAGE, true) activity.startActivity(intent) } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/CanChargeActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/CanChargeActivity.kt index 4938104..178be90 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/CanChargeActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/CanChargeActivity.kt @@ -24,7 +24,7 @@ class CanChargeActivity : BaseActivity( ) { private val viewModel: CanChargeViewModel by inject() - private var prevLiveRoom: Boolean = false + private var gotoPrevPage: Boolean = false private lateinit var adapter: CanChargeAdapter private lateinit var loadingDialog: LoadingDialog @@ -51,8 +51,8 @@ class CanChargeActivity : BaseActivity( binding.toolbar.tvBack.text = "충전하기" binding.toolbar.tvBack.setOnClickListener { finish() } - prevLiveRoom = intent.getBooleanExtra( - Constants.EXTRA_PREV_LIVE_ROOM, + gotoPrevPage = intent.getBooleanExtra( + Constants.EXTRA_GO_TO_PREV_PAGE, false ) @@ -60,7 +60,7 @@ class CanChargeActivity : BaseActivity( adapter = CanChargeAdapter { val intent = Intent(applicationContext, CanPaymentActivity::class.java) intent.putExtra(Constants.EXTRA_CAN, it) - intent.putExtra(Constants.EXTRA_PREV_LIVE_ROOM, prevLiveRoom) + intent.putExtra(Constants.EXTRA_GO_TO_PREV_PAGE, gotoPrevPage) activityResultLauncher.launch(intent) } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt index e3a197c..3cfdfce 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt @@ -38,7 +38,7 @@ class CanPaymentActivity : BaseActivity( private val viewModel: CanPaymentViewModel by inject() private var canResponse: CanResponse? = null - private var prevLiveRoom: Boolean = false + private var gotoPrevPage: Boolean = false private val handler = Handler(Looper.getMainLooper()) @@ -60,8 +60,8 @@ class CanPaymentActivity : BaseActivity( finish() } - prevLiveRoom = intent.getBooleanExtra( - Constants.EXTRA_PREV_LIVE_ROOM, + gotoPrevPage = intent.getBooleanExtra( + Constants.EXTRA_GO_TO_PREV_PAGE, false ) @@ -211,7 +211,7 @@ class CanPaymentActivity : BaseActivity( request, onSuccess = { Toast.makeText(applicationContext, "캔이 충전되었습니다", Toast.LENGTH_LONG).show() - if (prevLiveRoom) { + if (gotoPrevPage) { setResult(RESULT_OK) } else { val intent = Intent(applicationContext, CanStatusActivity::class.java)