From 86b498c00ebd29cecc399df8349c5fd7681add26 Mon Sep 17 00:00:00 2001
From: max <mxruan@163.com>
Date: Tue, 9 Jul 2024 15:42:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84log=20fix=EF=BC=9A=E5=AE=8C=E5=96=84=E9=94=80?=
 =?UTF-8?q?=E6=AF=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/chwl/app/application/App.java  |  4 +---
 .../com/chwl/app/ui/setting/SettingActivity.kt   |  5 ++---
 .../chwl/app/ui/wallet/payment/GPaymentClient.kt | 16 ++--------------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/application/App.java b/app/src/main/java/com/chwl/app/application/App.java
index ba627c915..7a4a9f1b4 100644
--- a/app/src/main/java/com/chwl/app/application/App.java
+++ b/app/src/main/java/com/chwl/app/application/App.java
@@ -324,9 +324,7 @@ public class App extends BaseApp {
         BasicConfig.INSTANCE.setVoiceDir(Constants.VOICE_DIR);
         BasicConfig.INSTANCE.setCacheDir(Constants.CACHE_DIR);
         BasicConfig.INSTANCE.setImageDir(Constants.IMAGE_CACHE_DIR);
-        // TODO 临时调整
-        com.example.lib_utils.log.LogUtil.INSTANCE.setConsolePrinterEnabled(true);
-//        com.example.lib_utils.log.LogUtil.INSTANCE.setConsolePrinterEnabled(BuildConfig.DEBUG);
+        com.example.lib_utils.log.LogUtil.INSTANCE.setConsolePrinterEnabled(BuildConfig.DEBUG);
     }
 
     /**
diff --git a/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt b/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt
index 92530abad..375f4562a 100644
--- a/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt
+++ b/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt
@@ -84,12 +84,11 @@ class SettingActivity : BaseViewBindingActivity<ActivitySettingBinding>(), View.
         binding.tvLanugage.setOnClickListener(this)
         binding.rlyPayPwd.setOnClickListener(this)
 
-        // TODO 临时调整
-//        if (BuildConfig.DEBUG) {
+        if (BuildConfig.DEBUG) {
             binding.titleBar.setOnTitleClickListener {
                 debug()
             }
-//        }
+        }
     }
 
     @SuppressLint("CheckResult")
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 4c252e85b..0de4b8ff8 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
@@ -140,20 +140,7 @@ class GPaymentClient(val activity: Activity) : IPaymentClient, IBillingService2.
     }
 
     private fun handlePurchases(isCurrentPaying: Boolean, purchases: IPurchase) {
-        logD("handlePurchases state:${purchases.getPurchaseState()}")
-        logD("handlePurchases orderId:${purchases.getOrderId()}")
-        logD("handlePurchases token:${purchases.getPurchaseToken()}")
-        logD("handlePurchases data:${purchases.getData()}")
-        logD(
-            "handlePurchases obfuscatedAccountId:${
-                purchases.getAccountIdentifiers()?.getObfuscatedAccountId()
-            }"
-        )
-        logD(
-            "handlePurchases obfuscatedProfileId:${
-                purchases.getAccountIdentifiers()?.getObfuscatedProfileId()
-            }"
-        )
+        logD("handlePurchases isCurrentPaying:${isCurrentPaying} state:${purchases.getPurchaseState()}")
         val identifiers = purchases.getAccountIdentifiers()
         if (purchases.isPurchasedState() && identifiers != null) {
             logD("handlePurchases() verifyOrder")
@@ -264,6 +251,7 @@ class GPaymentClient(val activity: Activity) : IPaymentClient, IBillingService2.
 
     override fun onCleared() {
         logD("onCleared()")
+        _billingService?.destroy()
         paymentIntent = null
         compositeDisposable?.dispose()
         compositeDisposable = null