From 303d71c07a2f63b634603fdf18f17befc19deb4f Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Sat, 11 Nov 2023 22:36:02 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0=E7=82=B9?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=9B=B8=E5=85=B3log=20feat:=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9Mob=E4=B8=80=E4=B8=AA=E9=85=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E7=A1=AE=E5=AE=9A=E6=98=AF=E5=90=A6=E5=BD=B1=E5=93=8D?=
 =?UTF-8?q?google=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bingchuang/app/ui/pay/BillingManager.java  | 5 ++++-
 .../main/java/com/bingchuang/app/ui/pay/ChargeActivity.java  | 4 ++++
 gradle.properties                                            | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/bingchuang/app/ui/pay/BillingManager.java b/app/src/main/java/com/bingchuang/app/ui/pay/BillingManager.java
index c912cdc70..839eaf8a2 100644
--- a/app/src/main/java/com/bingchuang/app/ui/pay/BillingManager.java
+++ b/app/src/main/java/com/bingchuang/app/ui/pay/BillingManager.java
@@ -107,10 +107,11 @@ public class BillingManager implements PurchasesUpdatedListener {
     /*更新商品*/
     @Override
     public void onPurchasesUpdated(BillingResult billingResult, List<Purchase> purchases) {
-        Log.i(TAG, "billingResult.getResponseCode()==" + billingResult.getResponseCode());
+        Log.i(TAG, "onPurchasesUpdated() billingResult.getResponseCode()==" + billingResult.getResponseCode());
         purchaseList.clear();
         if (billingResult.getResponseCode() == BillingResponseCode.OK) {
             if (purchases != null) {
+                Log.i(TAG, "onPurchasesUpdated purchases.size=" + purchases.size());
                 for (Purchase purchase : purchases) {
                     handlePurchase(purchase);
                 }
@@ -131,6 +132,7 @@ public class BillingManager implements PurchasesUpdatedListener {
         if (!verifyValidSignature(purchase.getOriginalJson(), purchase.getSignature())) {
             return;
         }
+        Log.i(TAG, "handlePurchase()");
         purchaseList.add(purchase);
     }
 
@@ -202,6 +204,7 @@ public class BillingManager implements PurchasesUpdatedListener {
     }
 
     public void consumeAsync(final String purchaseToken) {
+        Log.i(TAG,"consumeAsync()");
         final ConsumeParams consumeParams = ConsumeParams.newBuilder().setPurchaseToken(purchaseToken).build();
 
         executeServiceRequest(() -> billingClient.consumeAsync(consumeParams, (billingResult, s) ->
diff --git a/app/src/main/java/com/bingchuang/app/ui/pay/ChargeActivity.java b/app/src/main/java/com/bingchuang/app/ui/pay/ChargeActivity.java
index 620e3532d..63d419307 100644
--- a/app/src/main/java/com/bingchuang/app/ui/pay/ChargeActivity.java
+++ b/app/src/main/java/com/bingchuang/app/ui/pay/ChargeActivity.java
@@ -217,8 +217,10 @@ public class ChargeActivity extends BaseMvpActivity<IChargeView, ChargePresenter
     @Override
     public void onPurchasesUpdated(List<Purchase> purchases) {
         for (Purchase purchase : purchases) {
+            Log.i(TAG, "onPurchasesUpdated() state=" + purchase.getPurchaseState());
             if (purchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED &&
                     purchase.getAccountIdentifiers() != null) {
+                Log.i(TAG, "onPurchasesUpdated() verifyOrder");
                 PayModel.get().verifyOrder(
                                 purchase.getAccountIdentifiers().getObfuscatedAccountId(),
                                 purchase.getProducts().get(0),
@@ -247,6 +249,7 @@ public class ChargeActivity extends BaseMvpActivity<IChargeView, ChargePresenter
                                     }
                                 },
                                 throwable -> {
+                                    Log.i(TAG, "onPurchasesUpdated() throwable="+throwable.getMessage());
                                     if (!(throwable instanceof IgnoreException)) {
                                         SingleToastUtil.showToast(throwable.getMessage());
                                     }
@@ -258,6 +261,7 @@ public class ChargeActivity extends BaseMvpActivity<IChargeView, ChargePresenter
 
     @Override
     public void onConsumeFinished(String token, int result) {
+        Log.i(TAG, "onConsumeFinished()");
         getMvpPresenter().loadUserInfo();
     }
 
diff --git a/gradle.properties b/gradle.properties
index 91593a70c..20497cdc6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ android.enableJetifier=true
 android.enableResourceOptimizations=false
 
 # mob
-MobSDK.spEdition=FP
+MobSDK.spEdition=GPP
 
 only_arm64=false
 minify_enabled=false