From e38778d9e7d027aa9f9c5d73d61ee94bcfe68888 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Tue, 27 Aug 2024 17:05:23 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BA=94=20=EA=B2=B0=EC=A0=9C=EC=88=98?=
 =?UTF-8?q?=EB=8B=A8=20=EC=B6=94=EA=B0=80=20-=20=EC=B9=B4=EC=B9=B4?=
 =?UTF-8?q?=EC=98=A4=ED=8E=98=EC=9D=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   6 +-
 .../mypage/can/payment/CanPaymentActivity.kt  |  52 +++++++++++++-----
 .../main/res/drawable-xxhdpi/ic_kakaopay.png  | Bin 0 -> 3746 bytes
 .../main/res/layout/activity_can_payment.xml  |  16 +++++-
 4 files changed, 55 insertions(+), 19 deletions(-)
 create mode 100755 app/src/main/res/drawable-xxhdpi/ic_kakaopay.png

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>(
     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<ActivityCanPaymentBinding>(
         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<ActivityCanPaymentBinding>(
                     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<ActivityCanPaymentBinding>(
     }
 
     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 0000000000000000000000000000000000000000..cb967b392bdc58f468158f57a74171fba629241d
GIT binary patch
literal 3746
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
M07*qoM6N<$g6kMHQ~&?~

literal 0
HcmV?d00001

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" />
 
-                <View
+                <FrameLayout
+                    android:id="@+id/fl_method_kakaopay"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                    android:layout_marginStart="13.3dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/bg_round_corner_10_232323_777777"
+                    android:paddingVertical="8.3dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:contentDescription="@null"
+                        android:src="@drawable/ic_kakaopay" />
+                </FrameLayout>
             </LinearLayout>
 
             <TextView