From 6a558ad25c2f5af3778b944f01a6d050a11e6536 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Fri, 22 Mar 2024 12:07:56 +0900
Subject: [PATCH] versionName 1.8.7, versionCode 32

---
 app/build.gradle                                |  4 ++--
 .../mypage/can/charge/CanChargeActivity.kt      |  3 ++-
 .../can/charge/iap/CanChargeIapFragment.kt      | 17 ++++-------------
 .../mypage/can/payment/CanPaymentActivity.kt    |  4 +---
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3d2a1cf..7e8ba9b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,8 +40,8 @@ android {
         applicationId "kr.co.vividnext.sodalive"
         minSdk 23
         targetSdk 33
-        versionCode 28
-        versionName "1.8.3"
+        versionCode 32
+        versionName "1.8.7"
     }
 
     buildTypes {
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/CanChargeActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/CanChargeActivity.kt
index 0e4aefa..b3bb242 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/CanChargeActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/CanChargeActivity.kt
@@ -116,11 +116,12 @@ class CanChargeActivity : BaseActivity<ActivityCanChargeBinding>(
     fun successIapCharge() {
         if (gotoPrevPage) {
             setResult(RESULT_OK)
-            finish()
         } else {
             val intent = Intent(applicationContext, CanStatusActivity::class.java)
             startActivity(intent)
         }
+
+        finish()
     }
 
     companion object {
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/iap/CanChargeIapFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/iap/CanChargeIapFragment.kt
index 678b79f..3679a69 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/iap/CanChargeIapFragment.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/charge/iap/CanChargeIapFragment.kt
@@ -46,6 +46,7 @@ class CanChargeIapFragment : BaseFragment<FragmentCanChargeIapBinding>(
                     purchaseToken = purchase.purchaseToken,
                     chargeId = chargeId
                 ) {
+                    Toast.makeText(requireContext(), "캔이 충전되었습니다", Toast.LENGTH_LONG).show()
                     SharedPreferenceManager.can += chargeCan
                     (requireActivity() as CanChargeActivity).successIapCharge()
                 }
@@ -170,7 +171,8 @@ class CanChargeIapFragment : BaseFragment<FragmentCanChargeIapBinding>(
             "${requireContext().packageName}.can_105",
             "${requireContext().packageName}.can_350",
             "${requireContext().packageName}.can_550",
-            "${requireContext().packageName}.can_1170"
+            "${requireContext().packageName}.can_1170",
+            "${requireContext().packageName}.can_1970"
         )
 
         val params = QueryProductDetailsParams.newBuilder()
@@ -186,18 +188,7 @@ class CanChargeIapFragment : BaseFragment<FragmentCanChargeIapBinding>(
 
         billingClient.queryProductDetailsAsync(params) { billingResult, productDetailsList ->
             if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
-                handler.post {
-                    adapter.addItems(productDetailsList)
-                    productDetailsList.forEach {
-                        Toast.makeText(
-                            requireContext(),
-                            "${it.name}, ${it.description}, ${it.productId}, ${it.productType}, ${
-                                it.oneTimePurchaseOfferDetails?.priceAmountMicros
-                            }, ${it.oneTimePurchaseOfferDetails?.priceCurrencyCode}",
-                            Toast.LENGTH_LONG
-                        ).show()
-                    }
-                }
+                handler.post { adapter.addItems(productDetailsList) }
             } else {
                 handler.post { showToast("인 앱 결제 이용이 불가능 합니다. 다시 시도해 주세요.") }
             }
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 fe8c9f8..27b356e 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
@@ -211,15 +211,13 @@ class CanPaymentActivity : BaseActivity<ActivityCanPaymentBinding>(
             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)
                 }
-
-                SharedPreferenceManager.can += (canResponse!!.rewardCan + canResponse!!.can)
-
                 finish()
             },
             onFailure = {