From 888674b776176238b5c491b797b25ecfd198f889 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Sat, 29 Jun 2024 18:33:30 +0900
Subject: [PATCH] =?UTF-8?q?PG=20=EC=88=98=EC=A0=95=20-=20=ED=9C=B4?=
 =?UTF-8?q?=EB=8C=80=ED=8F=B0=20=EA=B2=B0=EC=A0=9C:=20=EC=9B=B0=EC=BB=B4?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EB=A8=BC=EC=B8=A0=20-=20=EB=82=98=EB=A8=B8?=
 =?UTF-8?q?=EC=A7=80=20:=20=ED=97=A5=ED=86=A0=ED=8C=8C=EC=9D=B4=EB=82=B8?=
 =?UTF-8?q?=EC=8A=A4(=EC=84=B8=ED=8B=80=EB=B1=85=ED=81=AC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                 |  2 ++
 .../mypage/can/payment/CanPaymentActivity.kt     | 16 ++++++++++++++--
 .../mypage/can/payment/CanPaymentTempActivity.kt |  2 +-
 app/src/main/res/layout/activity_settings.xml    |  1 +
 .../res/layout/fragment_audio_content_main.xml   |  1 +
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 10ce0c6..3329610 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,6 +51,7 @@ android {
 
             buildConfigField 'String', 'BASE_URL', '"https://api.sodalive.net"'
             buildConfigField 'String', 'BOOTPAY_APP_ID', '"64c35be1d25985001dc50c87"'
+            buildConfigField 'String', 'BOOTPAY_APP_HECTO_ID', '"664c1707b18b225deca4b429"'
             buildConfigField 'String', 'AGORA_APP_ID', '"e34e40046e9847baba3adfe2b8ffb4f6"'
             buildConfigField 'String', 'AGORA_APP_CERTIFICATE', '"15cadeea4ba94ff7b091c9a10f4bf4a6"'
         }
@@ -62,6 +63,7 @@ android {
 
             buildConfigField 'String', 'BASE_URL', '"https://test-api.sodalive.net"'
             buildConfigField 'String', 'BOOTPAY_APP_ID', '"6242a7772701800023f68b2e"'
+            buildConfigField 'String', 'BOOTPAY_APP_HECTO_ID', '"667fca5d3bab7404f831c3e4"'
             buildConfigField 'String', 'AGORA_APP_ID', '"b96574e191a9430fa54c605528aa3ef7"'
             buildConfigField 'String', 'AGORA_APP_CERTIFICATE', '"ae18ade3afcf4086bd4397726eb0654c"'
         }
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 27b356e..f50f274 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
@@ -159,12 +159,24 @@ class CanPaymentActivity : BaseActivity<ActivityCanPaymentBinding>(
 
     private fun requestPayment(chargeId: Long) {
         val payload = Payload()
-            .setApplicationId(BuildConfig.BOOTPAY_APP_ID)
+            .setApplicationId(
+                if (viewModel.paymentMethodLiveData.value!! == PaymentMethod.PHONE) {
+                    BuildConfig.BOOTPAY_APP_ID
+                } else {
+                    BuildConfig.BOOTPAY_APP_HECTO_ID
+                }
+            )
             .setOrderId("$chargeId")
             .setOrderName(canResponse!!.title)
             .setPrice(canResponse!!.price.toDouble())
             .setTaxFree(0.toDouble())
-            .setPg("웰컴페이먼츠")
+            .setPg(
+                if (viewModel.paymentMethodLiveData.value!! == PaymentMethod.PHONE) {
+                    "웰컴페이먼츠"
+                } else {
+                    "세틀뱅크"
+                }
+            )
             .setMethod(viewModel.paymentMethodLiveData.value!!.method)
 
         Bootpay.init(this, this)
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentTempActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentTempActivity.kt
index 5d4d966..f9b9a69 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentTempActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentTempActivity.kt
@@ -151,7 +151,7 @@ class CanPaymentTempActivity : BaseActivity<ActivityCanPaymentBinding>(
             .setUsername(SharedPreferenceManager.nickname)
 
         val payload = Payload()
-            .setApplicationId(BuildConfig.BOOTPAY_APP_ID)
+            .setApplicationId(BuildConfig.BOOTPAY_APP_HECTO_ID)
             .setOrderId("$chargeId")
             .setOrderName(title)
             .setPrice((can * 110).toDouble())
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index bbac86f..4ffd524 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -268,6 +268,7 @@
 - 대표자 : 이재형\n\n
 - 주소 : 경기도 성남시 분당구 황새울로335번길 10, 5층 563A호\n\n
 - 사업자등록번호 : 870-81-03220\n\n
+- 통신판매업신고 : 제2024-성남분당B-1012호\n\n
 - 고객센터 : 02.2055.1477\n\n
 - 대표 이메일 : sodalive.official@gmail.com
 "
diff --git a/app/src/main/res/layout/fragment_audio_content_main.xml b/app/src/main/res/layout/fragment_audio_content_main.xml
index 0b8ca79..80885d2 100644
--- a/app/src/main/res/layout/fragment_audio_content_main.xml
+++ b/app/src/main/res/layout/fragment_audio_content_main.xml
@@ -333,6 +333,7 @@
 - 대표자 : 이재형\n\n
 - 주소 : 경기도 성남시 분당구 황새울로335번길 10, 5층 563A호\n\n
 - 사업자등록번호 : 870-81-03220\n\n
+- 통신판매업신고 : 제2024-성남분당B-1012호\n\n
 - 고객센터 : 02.2055.1477\n\n
 - 대표 이메일 : sodalive.official@gmail.com"
                 android:textColor="@color/color_777777"