From be291fa7e116d0d56629e9d8a8a0ddca80059620 Mon Sep 17 00:00:00 2001 From: wzq Date: Thu, 19 Oct 2023 17:22:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20Google=20=E5=86=85?= =?UTF-8?q?=E8=B4=AD=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../avroom/firstcharge/FirstChargeDialog.kt | 56 +++++++----- .../yizhuan/erban/ui/pay/BillingManager.java | 86 +++++++++---------- .../yizhuan/erban/ui/pay/ChargeActivity.java | 48 +++++------ .../yizhuan/erban/ui/pay/ChargeAdapter.java | 4 +- .../com/yizhuan/erban/vip/VipMainActivity.kt | 46 +++++----- core/build.gradle | 4 +- .../pay/bean/ChargeBean.java | 14 +-- .../pay/bean/FirstChargeGoods.java | 4 +- 8 files changed, 133 insertions(+), 129 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt index 8fe9c41ba..c2f8e27a9 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt @@ -18,8 +18,8 @@ import android.widget.TextView import androidx.recyclerview.widget.GridLayoutManager import com.android.billingclient.api.BillingClient import com.android.billingclient.api.BillingResult +import com.android.billingclient.api.ProductDetails import com.android.billingclient.api.Purchase -import com.android.billingclient.api.SkuDetails import com.appsflyer.AFInAppEventParameterName import com.appsflyer.AFInAppEventType import com.appsflyer.AppsFlyerLib @@ -123,7 +123,7 @@ class FirstChargeDialog : BaseViewBindingActivity(), ResUtil.getString(R.string.avroom_firstcharge_firstchargedialog_01).toast() } else if (channel.equals(Constants.GOOGLE)) { goodsList?.get(position)?.let { charge -> - buyProduct(charge.skuDetails) + buyProduct(charge.productDetails) } } else { CommonWebViewActivity.start( @@ -142,18 +142,23 @@ class FirstChargeDialog : BaseViewBindingActivity(), FirstChargeReward.ONE -> { spanSize = 6 } + FirstChargeReward.TWO_LEFT -> { spanSize = 3 } + FirstChargeReward.TWO_RIGHT -> { spanSize = 3 } + FirstChargeReward.THREE -> { spanSize = 2 } + FirstChargeReward.TWO_LEFT_SMALL -> { spanSize = 3 } + FirstChargeReward.TWO_RIGHT_SMALL -> { spanSize = 3 } @@ -196,11 +201,13 @@ class FirstChargeDialog : BaseViewBindingActivity(), binding.rbPlanC.visibility = View.GONE binding.rbPlanA.text = "$${goodsList[0].chargeMoney}" } + 2 -> { binding.rbPlanC.visibility = View.GONE binding.rbPlanA.text = "$${goodsList[0].chargeMoney}" binding.rbPlanB.text = "$${goodsList[1].chargeMoney}" } + 3 -> { binding.rbPlanA.text = "$${goodsList[0].chargeMoney}" binding.rbPlanB.text = "$${goodsList[1].chargeMoney}" @@ -227,20 +234,19 @@ class FirstChargeDialog : BaseViewBindingActivity(), for (bean in goodsList) { productKeys.add(bean.chargeProdId) } - billingManager?.querySkuDetailsAsync( - BillingClient.SkuType.INAPP, productKeys - ) { billingResult: BillingResult, skuDetailsList: List? -> + billingManager?.querySkuDetailsAsync(productKeys) { billingResult: BillingResult, productDetails: MutableList -> if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) { Log.w( TAG, - "Unsuccessful query for type: " + BillingClient.SkuType.INAPP - + ". Error code: " + billingResult.responseCode + "Unsuccessful query for type: " + BillingClient.ProductType.INAPP + ". Error code: " + billingResult.responseCode ) - } else if (skuDetailsList != null && skuDetailsList.isNotEmpty()) { + return@querySkuDetailsAsync + } + if (productDetails.isNotEmpty()) { for (chargeBean in goodsList) { - for (skuDetails in skuDetailsList) { - if (skuDetails.sku == chargeBean.chargeProdId) { - chargeBean.skuDetails = skuDetails + for (skuDetails in productDetails) { + if (skuDetails.productId == chargeBean.chargeProdId) { + chargeBean.productDetails = skuDetails break } } @@ -258,7 +264,7 @@ class FirstChargeDialog : BaseViewBindingActivity(), ) { PayModel.get().verifyOrder( purchase.accountIdentifiers!!.obfuscatedAccountId, - purchase.skus[0], + purchase.products[0], purchase.packageName, purchase.purchaseToken ) @@ -267,12 +273,12 @@ class FirstChargeDialog : BaseViewBindingActivity(), { token: String? -> //L.i("token=" + token); billingManager?.consumeAsync(token) - var skuDetails: SkuDetails? = null + var skuDetails: ProductDetails? = null val goodList = goodsList - if (goodList != null && goodList.isNotEmpty()) { + if (!goodList.isNullOrEmpty()) { for (datum in goodList) { - if (datum.chargeProdId == purchase.skus[0]) { - skuDetails = datum.skuDetails + if (datum.chargeProdId == purchase.products[0]) { + skuDetails = datum.productDetails break } } @@ -282,12 +288,12 @@ class FirstChargeDialog : BaseViewBindingActivity(), HashMap() eventValue[AFInAppEventParameterName.CONTENT_TYPE] = "Gold" eventValue[AFInAppEventParameterName.QUANTITY] = 1 - eventValue[AFInAppEventParameterName.CONTENT_ID] = purchase.orderId + eventValue[AFInAppEventParameterName.CONTENT_ID] = purchase.orderId!! eventValue[AFInAppEventParameterName.REVENUE] = - skuDetails.priceAmountMicros / 1000000f - eventValue["Price"] = skuDetails.price + skuDetails.oneTimePurchaseOfferDetails?.priceAmountMicros!! / 1000000f + eventValue["Price"] = skuDetails.oneTimePurchaseOfferDetails?.formattedPrice!! eventValue[AFInAppEventParameterName.CURRENCY] = - skuDetails.priceCurrencyCode + skuDetails.oneTimePurchaseOfferDetails?.priceCurrencyCode!! AppsFlyerLib.getInstance().logEvent( applicationContext, AFInAppEventType.PURCHASE, @@ -315,10 +321,10 @@ class FirstChargeDialog : BaseViewBindingActivity(), /*购买商品*/ @SuppressLint("CheckResult") - fun buyProduct(skuDetails: SkuDetails?) { + fun buyProduct(skuDetails: ProductDetails?) { if (skuDetails != null) { - Log.d(TAG, "BuyProduct:" + skuDetails.sku) - PayModel.get().placeOrder(skuDetails.sku) + Log.d(TAG, "BuyProduct:" + skuDetails.productId) + PayModel.get().placeOrder(skuDetails.productId) .compose(bindToLifecycle()) .subscribe( { recordId: PayRecordId -> @@ -372,6 +378,7 @@ class FirstChargeDialog : BaseViewBindingActivity(), bean.itemType = FirstChargeReward.ONE } } + 2 -> { for (i in firstChargeRewardList.indices) { if (i == 0) { @@ -381,11 +388,13 @@ class FirstChargeDialog : BaseViewBindingActivity(), } } } + 3 -> { for (bean in firstChargeRewardList) { bean.itemType = FirstChargeReward.THREE } } + 4 -> { for (i in firstChargeRewardList.indices) { if ((i + 1) % 2 != 0) { @@ -395,6 +404,7 @@ class FirstChargeDialog : BaseViewBindingActivity(), } } } + else -> { if (firstChargeRewardList.size % 3 == 0) { for (bean in firstChargeRewardList) { diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java b/app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java index 84ff37046..2d50d1c5d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java +++ b/app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java @@ -3,28 +3,20 @@ package com.yizhuan.erban.ui.pay; import android.app.Activity; import android.util.Log; -import androidx.annotation.NonNull; - import com.alibaba.fastjson.JSONObject; -import com.android.billingclient.api.AcknowledgePurchaseParams; -import com.android.billingclient.api.AcknowledgePurchaseResponseListener; import com.android.billingclient.api.BillingClient; import com.android.billingclient.api.BillingClient.BillingResponseCode; -import com.android.billingclient.api.BillingClient.SkuType; import com.android.billingclient.api.BillingClientStateListener; import com.android.billingclient.api.BillingFlowParams; import com.android.billingclient.api.BillingResult; import com.android.billingclient.api.ConsumeParams; -import com.android.billingclient.api.ConsumeResponseListener; +import com.android.billingclient.api.ProductDetails; +import com.android.billingclient.api.ProductDetailsResponseListener; import com.android.billingclient.api.Purchase; -import com.android.billingclient.api.Purchase.PurchasesResult; import com.android.billingclient.api.PurchasesUpdatedListener; -import com.android.billingclient.api.SkuDetails; -import com.android.billingclient.api.SkuDetailsParams; -import com.android.billingclient.api.SkuDetailsResponseListener; -import com.yizhuan.erban.event.ChargeEvent; +import com.android.billingclient.api.QueryProductDetailsParams; +import com.android.billingclient.api.QueryPurchasesParams; -import org.greenrobot.eventbus.EventBus; import org.jetbrains.annotations.NotNull; import java.io.IOException; @@ -109,25 +101,23 @@ public class BillingManager implements PurchasesUpdatedListener { /*请求商品库存*/ public void onQueryPurchases() { - Runnable queryToExecute = () -> { - //系统当前时间 - long time = System.currentTimeMillis(); - //请求内购商品 - PurchasesResult purchasesResult = billingClient.queryPurchases(SkuType.INAPP); - onQueryPurchasesFinished(purchasesResult); - }; + Runnable queryToExecute = () -> + billingClient.queryPurchasesAsync( + QueryPurchasesParams.newBuilder() + .setProductType(BillingClient.ProductType.INAPP) + .build(), this::onQueryPurchasesFinished); executeServiceRequest(queryToExecute); } /*请求商品信息完成*/ - private void onQueryPurchasesFinished(PurchasesResult result) { + private void onQueryPurchasesFinished(BillingResult result, List list) { if (billingClient == null || result.getResponseCode() != BillingResponseCode.OK) { Log.w(TAG, "billingClient is null or result code (" + result.getResponseCode() + ") was bad - quitting"); return; } purchaseList.clear(); - onPurchasesUpdated(result.getBillingResult(), result.getPurchasesList()); + onPurchasesUpdated(result, list); } /*更新商品*/ @@ -178,28 +168,46 @@ public class BillingManager implements PurchasesUpdatedListener { } /*查询内购商品详情*/ - public void querySkuDetailsAsync(@SkuType final String itemType, final List skuList, - final SkuDetailsResponseListener listener) { + public void querySkuDetailsAsync(final List productIdList, + final ProductDetailsResponseListener listener) { Runnable queryRequest = () -> { - SkuDetailsParams.Builder params = SkuDetailsParams.newBuilder(); - params.setSkusList(skuList) - .setType(itemType); - billingClient.querySkuDetailsAsync(params.build(), listener); + ArrayList products = new ArrayList<>(); + for (String productId : productIdList) { + products.add(QueryProductDetailsParams.Product.newBuilder() + .setProductId(productId) + .setProductType(BillingClient.ProductType.INAPP) + .build()); + } + QueryProductDetailsParams queryProductDetailsParams = + QueryProductDetailsParams.newBuilder() + .setProductList(products) + .build(); + + billingClient.queryProductDetailsAsync( + queryProductDetailsParams, + listener + ); }; executeServiceRequest(queryRequest); } /*启动购买，订购流程*/ - public void initiatePurchaseFlow(final SkuDetails skuDetails, String recordId) { + public void initiatePurchaseFlow(final ProductDetails productDetails, String recordId) { Runnable purchaseFlowRequest = () -> { + BillingFlowParams.ProductDetailsParams p = BillingFlowParams.ProductDetailsParams.newBuilder() + .setProductDetails(productDetails) + .build(); JSONObject jsonObject = new JSONObject(); - jsonObject.put("p", skuDetails.getPrice()); - jsonObject.put("a", skuDetails.getPriceAmountMicros() / 10000); - jsonObject.put("c", skuDetails.getPriceCurrencyCode()); + ProductDetails.OneTimePurchaseOfferDetails oneTimePurchaseOfferDetails = productDetails.getOneTimePurchaseOfferDetails(); + if (oneTimePurchaseOfferDetails != null) { + jsonObject.put("p", oneTimePurchaseOfferDetails.getFormattedPrice()); + jsonObject.put("a", oneTimePurchaseOfferDetails.getPriceAmountMicros() / 10000); + jsonObject.put("c", oneTimePurchaseOfferDetails.getPriceCurrencyCode()); + } BillingFlowParams purchaseParams = BillingFlowParams.newBuilder() .setObfuscatedAccountId(recordId) .setObfuscatedProfileId(jsonObject.toJSONString()) - .setSkuDetails(skuDetails) + .setProductDetailsParamsList(List.of(p)) .build(); BillingResult billingResult = billingClient.launchBillingFlow(mActivity, purchaseParams); Log.i(TAG, " initiatePurchaseFlow billingResult=" + billingResult.getResponseCode() + " " + billingResult.getDebugMessage()); @@ -218,18 +226,8 @@ public class BillingManager implements PurchasesUpdatedListener { final ConsumeParams consumeParams = ConsumeParams.newBuilder().setPurchaseToken(purchaseToken).build(); - final ConsumeResponseListener consumeResponseListener = new ConsumeResponseListener() { - @Override - public void onConsumeResponse(@NonNull @NotNull BillingResult billingResult, @NonNull @NotNull String s) { - mBillingUpdatesListener.onConsumeFinished(purchaseToken, billingResult.getResponseCode()); - } - }; - executeServiceRequest(() -> billingClient.consumeAsync(consumeParams, consumeResponseListener)); - } - - - public void acknowledgePurchase(AcknowledgePurchaseParams acknowledgePurchaseParams, AcknowledgePurchaseResponseListener Listener) { - billingClient.acknowledgePurchase(acknowledgePurchaseParams, Listener); + executeServiceRequest(() -> billingClient.consumeAsync(consumeParams, (billingResult, s) -> + mBillingUpdatesListener.onConsumeFinished(purchaseToken, billingResult.getResponseCode()))); } /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java index 6684390f7..18cd683d2 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java @@ -24,8 +24,8 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.android.billingclient.api.BillingClient; +import com.android.billingclient.api.ProductDetails; import com.android.billingclient.api.Purchase; -import com.android.billingclient.api.SkuDetails; import com.appsflyer.AFInAppEventParameterName; import com.appsflyer.AFInAppEventType; import com.appsflyer.AppsFlyerLib; @@ -186,19 +186,19 @@ public class ChargeActivity extends BaseMvpActivity { + billingManager.querySkuDetailsAsync(productKeys, (billingResult, productDetails) -> { if (billingResult.getResponseCode() != BillingClient.BillingResponseCode.OK) { - Log.w(TAG, "Unsuccessful query for type: " + BillingClient.SkuType.INAPP + Log.w(TAG, "Unsuccessful query for type: " + BillingClient.ProductType.INAPP + ". Error code: " + billingResult.getResponseCode()); getDialogManager().dismissDialog(); toast(getString(R.string.Recharge_failure)); - } else if (skuDetailsList != null && skuDetailsList.size() > 0) { + } else if (productDetails.size() > 0) { getDialogManager().dismissDialog(); List showChargeList = new ArrayList<>(); for (ChargeBean chargeBean : chargeBeanList) { - for (SkuDetails skuDetails : skuDetailsList) { - if (skuDetails.getSku().equals(chargeBean.getChargeProdId())) { - chargeBean.setSkuDetails(skuDetails); + for (ProductDetails product : productDetails) { + if (product.getProductId().equals(chargeBean.getChargeProdId())) { + chargeBean.setProductDetails(product); showChargeList.add(chargeBean); break; } @@ -221,30 +221,28 @@ public class ChargeActivity extends BaseMvpActivity { - //L.i("token=" + token); + .subscribe(token -> { billingManager.consumeAsync(token); - SkuDetails skuDetails = null; + ProductDetails productDetails = null; for (ChargeBean datum : mChargeAdapter.getData()) { - if (datum.getChargeProdId().equals(purchase.getSkus().get(0))) { - skuDetails = datum.getSkuDetails(); + if (datum.getChargeProdId().equals(purchase.getProducts().get(0))) { + productDetails = datum.getProductDetails(); break; } } - if (skuDetails != null) { + if (productDetails != null) { Map eventValue = new HashMap<>(); eventValue.put(AFInAppEventParameterName.CONTENT_TYPE, "Gold"); eventValue.put(AFInAppEventParameterName.QUANTITY, 1); eventValue.put(AFInAppEventParameterName.CONTENT_ID, purchase.getOrderId()); - eventValue.put(AFInAppEventParameterName.REVENUE, skuDetails.getPriceAmountMicros() / 1000000f); - eventValue.put("Price", skuDetails.getPrice()); - eventValue.put(AFInAppEventParameterName.CURRENCY, skuDetails.getPriceCurrencyCode()); + eventValue.put(AFInAppEventParameterName.REVENUE, productDetails.getOneTimePurchaseOfferDetails().getPriceAmountMicros() / 1000000f); + eventValue.put("Price", productDetails.getOneTimePurchaseOfferDetails().getFormattedPrice()); + eventValue.put(AFInAppEventParameterName.CURRENCY, productDetails.getOneTimePurchaseOfferDetails().getPriceCurrencyCode()); AppsFlyerLib.getInstance().logEvent(getApplicationContext(), AFInAppEventType.PURCHASE, eventValue); } }, @@ -269,12 +267,12 @@ public class ChargeActivity extends BaseMvpActivity billingManager.initiatePurchaseFlow(skuDetails, recordId.getRecordId()), + .subscribe(recordId -> billingManager.initiatePurchaseFlow(productDetails, recordId.getRecordId()), throwable -> { if (throwable instanceof FailReasonException) { FailReasonException failReasonException = (FailReasonException) throwable; @@ -342,8 +340,8 @@ public class ChargeActivity extends BaseMvpActivity map = new HashMap<>(3); map.put(IReportConstants.MONEY, bean.money); diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeAdapter.java index 294fa6205..a54eb7983 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeAdapter.java @@ -21,8 +21,8 @@ public class ChargeAdapter extends BaseQuickAdapter if (chargeBean == null) return; baseViewHolder.getView(R.id.ll_bg).setSelected(chargeBean.isSelected); baseViewHolder.setText(R.id.tv_title, chargeBean.getProdName()); - if (chargeBean.getSkuDetails() != null) { - baseViewHolder.setText(R.id.item_charge_money, chargeBean.getSkuDetails().getPrice()); + if (chargeBean.getProductDetails() != null) { + baseViewHolder.setText(R.id.item_charge_money, chargeBean.getProductDetails().getOneTimePurchaseOfferDetails().getFormattedPrice()); } else { baseViewHolder.setText(R.id.item_charge_money, "USD$" + chargeBean.getMoney()); } diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt b/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt index a31a223ad..27831a8a9 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt @@ -14,8 +14,8 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.GridLayoutManager import com.android.billingclient.api.BillingClient import com.android.billingclient.api.BillingResult +import com.android.billingclient.api.ProductDetails import com.android.billingclient.api.Purchase -import com.android.billingclient.api.SkuDetails import com.appsflyer.AFInAppEventParameterName import com.appsflyer.AFInAppEventType import com.appsflyer.AppsFlyerLib @@ -233,12 +233,12 @@ class VipMainActivity : BaseViewBindingActivity(), binding.tvOpenVip.setOnClickListener { if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) { - if ((googleChargeBean?.skuDetails?.price ?: "0") == "0") { + if ((googleChargeBean?.productDetails?.oneTimePurchaseOfferDetails?.priceAmountMicros ?: "0") == "0") { toast(getString(R.string.Recharge_failure)) return@setOnClickListener } SelectPayTypeDialog.newInstance( - googleChargeBean?.skuDetails?.price ?: "0", + googleChargeBean?.productDetails?.oneTimePurchaseOfferDetails?.formattedPrice ?: "0", true, googleChargeBean?.getMoney() ?: 0.0 ) @@ -248,7 +248,7 @@ class VipMainActivity : BaseViewBindingActivity(), } setOnGoogleChargeClick { googleChargeBean?.let { charge -> - buyProduct(charge.skuDetails) + buyProduct(charge.productDetails) } } setOnChargeClick { @@ -396,20 +396,18 @@ class VipMainActivity : BaseViewBindingActivity(), chargeInfo?.let { chargeBean -> val productKeys: MutableList = ArrayList() productKeys.add(chargeBean.getChargeProdId()) - billingManager?.querySkuDetailsAsync( - BillingClient.SkuType.INAPP, productKeys - ) { billingResult: BillingResult, skuDetailsList: List? -> + billingManager?.querySkuDetailsAsync(productKeys) { billingResult: BillingResult, productDetails: List -> if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) { Log.w( TAG, "Unsuccessful query for type: " + BillingClient.SkuType.INAPP + ". Error code: " + billingResult.responseCode ) - } else if (skuDetailsList != null && skuDetailsList.isNotEmpty()) { + } else if (productDetails.isNotEmpty()) { val showChargeList: MutableList = ArrayList() - for (skuDetails in skuDetailsList) { - if (skuDetails.sku == chargeBean.getChargeProdId()) { - chargeBean.skuDetails = skuDetails + for (skuDetails in productDetails) { + if (skuDetails.productId == chargeBean.getChargeProdId()) { + chargeBean.productDetails = skuDetails showChargeList.add(chargeBean) break } @@ -439,7 +437,7 @@ class VipMainActivity : BaseViewBindingActivity(), ) { PayModel.get().verifyOrder( purchase.accountIdentifiers!!.obfuscatedAccountId, - purchase.skus[0], + purchase.products[0], purchase.packageName, purchase.purchaseToken ) @@ -448,21 +446,21 @@ class VipMainActivity : BaseViewBindingActivity(), { token: String? -> //L.i("token=" + token); billingManager?.consumeAsync(token) - var skuDetails: SkuDetails? = null - if (googleChargeBean?.getChargeProdId() == purchase.skus[0]) { - skuDetails = googleChargeBean?.skuDetails + var skuDetails: ProductDetails? = null + if (googleChargeBean?.getChargeProdId() == purchase.products[0]) { + skuDetails = googleChargeBean?.productDetails } if (skuDetails != null) { val eventValue: MutableMap = HashMap() eventValue[AFInAppEventParameterName.CONTENT_TYPE] = "Gold" eventValue[AFInAppEventParameterName.QUANTITY] = 1 - eventValue[AFInAppEventParameterName.CONTENT_ID] = purchase.orderId + eventValue[AFInAppEventParameterName.CONTENT_ID] = purchase.orderId!! eventValue[AFInAppEventParameterName.REVENUE] = - skuDetails.priceAmountMicros / 1000000f - eventValue["Price"] = skuDetails.price + skuDetails.oneTimePurchaseOfferDetails?.priceAmountMicros!! / 1000000f + eventValue["Price"] = skuDetails.oneTimePurchaseOfferDetails?.formattedPrice!! eventValue[AFInAppEventParameterName.CURRENCY] = - skuDetails.priceCurrencyCode + skuDetails.oneTimePurchaseOfferDetails?.priceCurrencyCode!! AppsFlyerLib.getInstance().logEvent( applicationContext, AFInAppEventType.PURCHASE, @@ -490,15 +488,15 @@ class VipMainActivity : BaseViewBindingActivity(), /*购买商品*/ @SuppressLint("CheckResult") - fun buyProduct(skuDetails: SkuDetails?) { - if (skuDetails != null) { - Log.d(TAG, "BuyProduct:" + skuDetails.sku) - PayModel.get().placeOrder(skuDetails.sku) + fun buyProduct(productDetails: ProductDetails?) { + if (productDetails != null) { + Log.d(TAG, "BuyProduct:" + productDetails.productId) + PayModel.get().placeOrder(productDetails.productId) .compose(bindToLifecycle()) .subscribe( { recordId: PayRecordId -> billingManager?.initiatePurchaseFlow( - skuDetails, + productDetails, recordId.recordId ) } diff --git a/core/build.gradle b/core/build.gradle index e9ddd7cea..9a2963a63 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -95,8 +95,8 @@ dependencies { implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1' //googleplay内购 - api 'com.google.android.gms:play-services-wallet:19.1.0' - api 'com.android.billingclient:billing:4.1.0' + api 'com.google.android.gms:play-services-wallet:19.2.1' + api 'com.android.billingclient:billing:6.0.1' api 'org.jetbrains.kotlin:kotlin-reflect:1.7.10' diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java b/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java index deaded7d9..5f9af5ea2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java @@ -1,6 +1,6 @@ package com.yizhuan.xchat_android_core.pay.bean; -import com.android.billingclient.api.SkuDetails; +import com.android.billingclient.api.ProductDetails; import java.io.Serializable; @@ -25,7 +25,7 @@ public class ChargeBean implements Serializable{ public int giftGoldNum; public int channel; public String prodDesc; - private SkuDetails skuDetails; + private ProductDetails mProductDetails; public boolean isSelected; @@ -82,12 +82,12 @@ public class ChargeBean implements Serializable{ this.prodDesc = prodDesc; } - public SkuDetails getSkuDetails() { - return skuDetails; + public ProductDetails getProductDetails() { + return mProductDetails; } - public void setSkuDetails(SkuDetails skuDetails) { - this.skuDetails = skuDetails; + public void setProductDetails(ProductDetails productDetails) { + this.mProductDetails = productDetails; } public boolean isSelected() { @@ -107,7 +107,7 @@ public class ChargeBean implements Serializable{ ", giftGoldNum=" + giftGoldNum + ", channel=" + channel + ", prodDesc='" + prodDesc + '\'' + - ", skuDetails=" + skuDetails + + ", productDetails=" + mProductDetails + ", isSelected=" + isSelected + '}'; } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java b/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java index d7cd63e1b..9fade028a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java @@ -1,6 +1,6 @@ package com.yizhuan.xchat_android_core.pay.bean; -import com.android.billingclient.api.SkuDetails; +import com.android.billingclient.api.ProductDetails; import java.util.ArrayList; @@ -17,5 +17,5 @@ public class FirstChargeGoods { private ArrayList firstChargeRewardList; private String giveMoney; private boolean finishCharge; - private SkuDetails skuDetails; + private ProductDetails productDetails; }