From 6689932393bbd2478f581f14e73aa54562cbd627 Mon Sep 17 00:00:00 2001 From: klaus Date: Fri, 8 Nov 2024 16:47:15 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20-=20=EC=86=8C=EC=9E=A5=EB=A7=8C,=20=EB=8C=80?= =?UTF-8?q?=EC=97=AC=EB=A7=8C=20=EA=B0=80=EB=8A=A5=EC=8B=9C=20=EA=B5=AC?= =?UTF-8?q?=EB=A7=A4=ED=95=98=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EB=B0=B0?= =?UTF-8?q?=EA=B2=BD=EC=83=89=20=EB=B3=80=EA=B2=BD=20-=20=EC=86=8C?= =?UTF-8?q?=EC=9E=A5=EB=A7=8C,=20=EB=8C=80=EC=97=AC=EB=A7=8C=20=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=EC=8B=9C=20=EA=B5=AC=EB=A7=A4=ED=95=98=EA=B8=B0=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=EC=9D=84=20=ED=84=B0=EC=B9=98=ED=95=98?= =?UTF-8?q?=EB=A9=B4=20=EB=B0=94=EB=A1=9C=20=EA=B5=AC=EB=A7=A4=ED=99=95?= =?UTF-8?q?=EC=9D=B8=20=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/AudioContentDetailActivity.kt | 59 +++++++++++-------- .../detail/GetAudioContentDetailResponse.kt | 3 +- .../order/AudioContentOrderConfirmDialog.kt | 5 +- .../order/AudioContentOrderFragment.kt | 30 ++++------ .../drawable/bg_round_corner_5_3_548f7d.xml | 8 +++ .../drawable/bg_round_corner_5_3_59548f.xml | 8 +++ 6 files changed, 63 insertions(+), 50 deletions(-) create mode 100644 app/src/main/res/drawable/bg_round_corner_5_3_548f7d.xml create mode 100644 app/src/main/res/drawable/bg_round_corner_5_3_59548f.xml 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 8224caa..b6a03ac 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 @@ -30,6 +30,7 @@ import com.bumptech.glide.request.RequestOptions import com.google.gson.Gson import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService +import kr.co.vividnext.sodalive.audio_content.PurchaseOption import kr.co.vividnext.sodalive.audio_content.comment.AudioContentCommentFragment import kr.co.vividnext.sodalive.audio_content.modify.AudioContentModifyActivity import kr.co.vividnext.sodalive.audio_content.order.AudioContentOrderConfirmDialog @@ -585,27 +586,39 @@ class AudioContentDetailActivity : BaseActivity { + binding.tvStrPurchaseOrRental.text = " 구매하기" + binding.llPurchase.setBackgroundResource( + R.drawable.bg_round_corner_5_3_3bb9f1 + ) + } + + PurchaseOption.BUY_ONLY -> { + binding.tvStrPurchaseOrRental.text = " 소장하기" + binding.llPurchase.setBackgroundResource( + R.drawable.bg_round_corner_5_3_59548f + ) + } + + PurchaseOption.RENT_ONLY -> { + binding.tvStrPurchaseOrRental.text = " 대여하기" + binding.llPurchase.setBackgroundResource( + R.drawable.bg_round_corner_5_3_548f7d + ) + } } + val limitedEdition = response.totalContentCount != null && + response.remainingContentCount != null + binding.llPurchase.setOnClickListener { - if ( - response.totalContentCount != null && - response.remainingContentCount != null - ) { - showOrderConfirmDialog( - audioContent = response, - isOnlyRental = false, - OrderType.KEEP - ) + if (limitedEdition || response.purchaseOption == PurchaseOption.BUY_ONLY) { + showOrderConfirmDialog(audioContent = response, OrderType.KEEP) + } else if (response.purchaseOption == PurchaseOption.RENT_ONLY) { + showOrderConfirmDialog(audioContent = response, OrderType.RENTAL) } else { - showOrderDialog( - audioContent = response, - isOnlyRental = response.isOnlyRental - ) + showOrderDialog(audioContent = response) } } } @@ -895,15 +908,11 @@ class AudioContentDetailActivity : BaseActivity Unit, @@ -64,14 +63,14 @@ class AudioContentOrderConfirmDialog( if (SharedPreferenceManager.userId == 17958L) { dialogView.ivCan.visibility = View.GONE - dialogView.tvPrice.text = if (orderType == OrderType.RENTAL && !isOnlyRental) { + dialogView.tvPrice.text = if (orderType == OrderType.RENTAL) { "${(ceil(price * 0.7).toInt() * 110).moneyFormat()}원" } else { "${(price * 110).moneyFormat()}원" } } else { dialogView.ivCan.visibility = View.VISIBLE - dialogView.tvPrice.text = if (orderType == OrderType.RENTAL && !isOnlyRental) { + dialogView.tvPrice.text = if (orderType == OrderType.RENTAL) { ceil(price * 0.7).toInt().moneyFormat() } else { price.moneyFormat() diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderFragment.kt index 026dcf1..ba10660 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderFragment.kt @@ -13,7 +13,6 @@ import kotlin.math.ceil class AudioContentOrderFragment( private val price: Int, - private val isOnlyRental: Boolean, private val onClickRental: () -> Unit, private val onClickKeep: () -> Unit ) : BottomSheetDialogFragment() { @@ -43,27 +42,18 @@ class AudioContentOrderFragment( binding.ivRentalCan.visibility = View.VISIBLE } - if (isOnlyRental) { - if (SharedPreferenceManager.userId == 17958L) { - binding.tvRental.text = "${(price * 110).moneyFormat()}원" - } else { - binding.tvRental.text = price.moneyFormat() - } - binding.rlKeep.visibility = View.GONE + if (SharedPreferenceManager.userId == 17958L) { + binding.tvKeep.text = "${(price * 110).moneyFormat()}원" + binding.tvRental.text = "${(ceil(price * 0.7).toInt() * 110).moneyFormat()}원" } else { - if (SharedPreferenceManager.userId == 17958L) { - binding.tvKeep.text = "${(price * 110).moneyFormat()}원" - binding.tvRental.text = "${(ceil(price * 0.7).toInt() * 110).moneyFormat()}원" - } else { - binding.tvKeep.text = price.moneyFormat() - binding.tvRental.text = ceil(price * 0.7).toInt().moneyFormat() - } + binding.tvKeep.text = price.moneyFormat() + binding.tvRental.text = ceil(price * 0.7).toInt().moneyFormat() + } - binding.rlKeep.visibility = View.VISIBLE - binding.llKeep.setOnClickListener { - onClickKeep() - dismiss() - } + binding.rlKeep.visibility = View.VISIBLE + binding.llKeep.setOnClickListener { + onClickKeep() + dismiss() } binding.llRental.setOnClickListener { diff --git a/app/src/main/res/drawable/bg_round_corner_5_3_548f7d.xml b/app/src/main/res/drawable/bg_round_corner_5_3_548f7d.xml new file mode 100644 index 0000000..7699568 --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_5_3_548f7d.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_round_corner_5_3_59548f.xml b/app/src/main/res/drawable/bg_round_corner_5_3_59548f.xml new file mode 100644 index 0000000..7534ec1 --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_5_3_59548f.xml @@ -0,0 +1,8 @@ + + + + + +