From 049006aa8b5f21ed2cfb6aadbbe47bf81edc8a8a Mon Sep 17 00:00:00 2001
From: max <mxruan@163.com>
Date: Tue, 9 Jul 2024 20:07:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=A1=A5=E5=85=85=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/wallet/payment/GPaymentClient.kt   | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/ui/wallet/payment/GPaymentClient.kt b/app/src/main/java/com/chwl/app/ui/wallet/payment/GPaymentClient.kt
index 0de4b8ff8..e443cda7d 100644
--- a/app/src/main/java/com/chwl/app/ui/wallet/payment/GPaymentClient.kt
+++ b/app/src/main/java/com/chwl/app/ui/wallet/payment/GPaymentClient.kt
@@ -123,7 +123,7 @@ class GPaymentClient(val activity: Activity) : IPaymentClient, IBillingService2.
             tryLaunch()
         } else {
             callFailed(
-                IPaymentClient.CODE_UNAVAILABLE
+                IPaymentClient.CODE_UNAVAILABLE, billingResult
             )
         }
     }
@@ -135,7 +135,7 @@ class GPaymentClient(val activity: Activity) : IPaymentClient, IBillingService2.
                 handlePurchases(true, it)
             }
         } else {
-            callFailed(IPaymentClient.CODE_PURCHASE_FAILED)
+            callFailed(IPaymentClient.CODE_PURCHASE_FAILED, billingResult)
         }
     }
 
@@ -175,7 +175,7 @@ class GPaymentClient(val activity: Activity) : IPaymentClient, IBillingService2.
                             callSuccess(orderId)
                         }
                     } else {
-                        callFailed(IPaymentClient.CODE_CONSUME_ORDER_FAILED)
+                        callFailed(IPaymentClient.CODE_CONSUME_ORDER_FAILED, billingResult)
                     }
                 }
             }
@@ -195,10 +195,10 @@ class GPaymentClient(val activity: Activity) : IPaymentClient, IBillingService2.
             if (item != null) {
                 tryLaunch()
             } else {
-                callFailed(IPaymentClient.CODE_PRODUCT_NOT_FOUND)
+                callFailed(IPaymentClient.CODE_PRODUCT_NOT_FOUND, billingResult)
             }
         } else {
-            callFailed(IPaymentClient.CODE_PRODUCT_NOT_FOUND)
+            callFailed(IPaymentClient.CODE_PRODUCT_NOT_FOUND, billingResult)
         }
     }
 
@@ -221,6 +221,17 @@ class GPaymentClient(val activity: Activity) : IPaymentClient, IBillingService2.
         )
     }
 
+    private fun callFailed(code: Int, billingResult: IBillingResult) {
+        callFailed(
+            code,
+            PaymentException(
+                code,
+                message = activity.getString(R.string.common_operation_prompt_format)
+                    .format("$code-${billingResult.getResponseCode()}")
+            )
+        )
+    }
+
     private fun callFailed(code: Int, throwable: Throwable) {
         throwable.printStackTrace()
         logD("callFailed() code:${code} throwable:${throwable.message}")