PG 결제 - 휴대폰

- 헥토파이낸셜로 변경

app/build.gradle

@@ -40,8 +40,8 @@ android {
         applicationId "kr.co.vividnext.sodalive"
         minSdk 23
         targetSdk 33
-        versionCode 82
+        versionCode 83
-        versionName "1.13.0"
+        versionName "1.13.1"
     }
 
     buildTypes {

app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt

@@ -159,39 +159,28 @@ 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(SharedPreferenceManager.nickname)
+            .setUsername(username)
 
         val payload = Payload()
-            .setApplicationId(
+            .setApplicationId(BuildConfig.BOOTPAY_APP_HECTO_ID)
-                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)
+            .setUser(user)
 
         Bootpay.init(this, this)
-            .setPayload(
+            .setPayload(payload)
-                if (viewModel.paymentMethodLiveData.value!! == PaymentMethod.PHONE) {
-                    payload
-                } else {
-                    payload.setUser(user)
-                }
-            )
             .setEventListener(object : BootpayEventListener {
                 override fun onCancel(data: String) {
                     Logger.e("onCancel: $data")
@@ -230,25 +219,6 @@ class CanPaymentActivity : BaseActivity<ActivityCanPaymentBinding>(
         val bootpayResponse = Gson().fromJson(data, BootpayResponse::class.java)
         val request = VerifyRequest(bootpayResponse.data.receiptId, bootpayResponse.data.orderId)
 
-        if (viewModel.paymentMethodLiveData.value!! == PaymentMethod.PHONE) {
-            viewModel.verify(
-                request,
-                onSuccess = {
-                    Toast.makeText(applicationContext, "캔이 충전되었습니다", Toast.LENGTH_LONG).show()
-                    SharedPreferenceManager.can += (canResponse!!.rewardCan + canResponse!!.can)
-                    if (gotoPrevPage) {
-                        setResult(RESULT_OK)
-                    } else {
-                        val intent = Intent(applicationContext, CanStatusActivity::class.java)
-                        startActivity(intent)
-                    }
-                    finish()
-                },
-                onFailure = {
-                    Toast.makeText(applicationContext, it, Toast.LENGTH_LONG).show()
-                }
-            )
-        } else {
         viewModel.verifyHecto(
             request,
             onSuccess = {
@@ -268,4 +238,3 @@ class CanPaymentActivity : BaseActivity<ActivityCanPaymentBinding>(
         )
     }
 }
-}