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(), 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