diff --git a/app/build.gradle b/app/build.gradle index aa41294..0bb3f15 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,8 +35,8 @@ android { applicationId "kr.co.vividnext.sodalive" minSdk 23 targetSdk 34 - versionCode 99 - versionName "1.16.0" + versionCode 100 + versionName "1.16.1" } buildTypes { @@ -137,7 +137,7 @@ dependencies { implementation 'com.google.firebase:firebase-config-ktx' // bootpay - implementation "io.github.bootpay:android:4.3.4" + implementation "io.github.bootpay:android:4.4.3" // agora implementation "io.agora.rtc:voice-sdk:4.2.6" 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 adea976..cd3c626 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 @@ -33,13 +33,17 @@ class CanPaymentActivity : BaseActivity( ActivityCanPaymentBinding::inflate ) { enum class PaymentMethod(val method: String) { - CARD("카드"), BANK("계좌이체"), PHONE("휴대폰") + CARD("카드"), + BANK("계좌이체"), + PHONE("휴대폰"), + KAKAOPAY("카카오페이") } private val viewModel: CanPaymentViewModel by inject() private var canResponse: CanResponse? = null private var gotoPrevPage: Boolean = false + private var isKakao: Boolean = false private val handler = Handler(Looper.getMainLooper()) @@ -105,6 +109,9 @@ class CanPaymentActivity : BaseActivity( binding.tvMethodCard.setOnClickListener { viewModel.setPaymentMethod(PaymentMethod.CARD) } binding.tvMethodBank.setOnClickListener { viewModel.setPaymentMethod(PaymentMethod.BANK) } binding.tvMethodPhone.setOnClickListener { viewModel.setPaymentMethod(PaymentMethod.PHONE) } + binding.flMethodKakaopay.setOnClickListener { + viewModel.setPaymentMethod(PaymentMethod.KAKAOPAY) + } viewModel.paymentMethodLiveData.observe(this) { allPaymentMethodSelectFalse() @@ -114,15 +121,23 @@ class CanPaymentActivity : BaseActivity( PaymentMethod.CARD -> paymentMethodSelect(binding.tvMethodCard) PaymentMethod.BANK -> paymentMethodSelect(binding.tvMethodBank) PaymentMethod.PHONE -> paymentMethodSelect(binding.tvMethodPhone) + PaymentMethod.KAKAOPAY -> { + isKakao = true + binding.flMethodKakaopay + .setBackgroundResource(R.drawable.bg_round_corner_10_13181b_3bb9f1) + } } } } } private fun allPaymentMethodSelectFalse() { + isKakao = false paymentMethodSelectFalse(binding.tvMethodBank) paymentMethodSelectFalse(binding.tvMethodCard) paymentMethodSelectFalse(binding.tvMethodPhone) + binding.flMethodKakaopay + .setBackgroundResource(R.drawable.bg_round_corner_10_232323_777777) } private fun paymentMethodSelectFalse(view: TextView) { @@ -159,25 +174,34 @@ class CanPaymentActivity : BaseActivity( } private fun requestPayment(chargeId: Long) { - var username = SharedPreferenceManager.nickname - - if (username.length > 10) { - username = "${username.take(6)}..." - } - - val user = BootUser() - .setId("${SharedPreferenceManager.userId}") - .setUsername(username) - - val payload = Payload() + var payload = Payload() .setApplicationId(BuildConfig.BOOTPAY_APP_HECTO_ID) .setOrderId("$chargeId") .setOrderName(canResponse!!.title) .setPrice(canResponse!!.price.toDouble()) .setTaxFree(0.toDouble()) - .setPg("세틀뱅크") + .setPg( + if (isKakao) { + "카카오" + } else { + "세틀뱅크" + } + ) .setMethod(viewModel.paymentMethodLiveData.value!!.method) - .setUser(user) + + if (!isKakao) { + var username = SharedPreferenceManager.nickname + + if (username.length > 10) { + username = "${username.take(6)}..." + } + + val user = BootUser() + .setId("${SharedPreferenceManager.userId}") + .setUsername(username) + + payload = payload.setUser(user) + } Bootpay.init(this, this) .setPayload(payload) diff --git a/app/src/main/res/drawable-xxhdpi/ic_kakaopay.png b/app/src/main/res/drawable-xxhdpi/ic_kakaopay.png new file mode 100755 index 0000000..cb967b3 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_kakaopay.png differ diff --git a/app/src/main/res/layout/activity_can_payment.xml b/app/src/main/res/layout/activity_can_payment.xml index 726bf5c..3ebe2ee 100644 --- a/app/src/main/res/layout/activity_can_payment.xml +++ b/app/src/main/res/layout/activity_can_payment.xml @@ -152,10 +152,22 @@ android:textColor="@color/color_eeeeee" android:textSize="13.3sp" /> - + android:layout_marginStart="13.3dp" + android:layout_weight="1" + android:background="@drawable/bg_round_corner_10_232323_777777" + android:paddingVertical="8.3dp"> + + +