Optimizing google play implementation (#18047)

* Optimizing google play implementation * Initializing member variables * Remove redundant code --------- Co-authored-by: qiuguohua <[email protected]>
cocos · Dec 17, 2024 · a670a91 · a670a91
1 parent d3b121f
commit a670a91
Show file tree

Hide file tree

Showing 14 changed files with 279 additions and 325 deletions.
diff --git a/@types/jsb.d.ts b/@types/jsb.d.ts
@@ -1411,9 +1411,9 @@ declare namespace jsb {
         isExternalOfferAvailableAsync: (listener: ExternalOfferAvailabilityListener) => void;
 
         isFeatureSupported: (productType: string) => BillingResult;
-        showAlternativeBillingOnlyInformationDialog: (listener: AlternativeBillingOnlyInformationDialogListener) => BillingResult;
-        showExternalOfferInformationDialog: (listener: ExternalOfferInformationDialogListener) => BillingResult;
-        showInAppMessages: (params: InAppMessageParams, listener: InAppMessageResponseListener) => BillingResult;
+        showAlternativeBillingOnlyInformationDialog: (listener: AlternativeBillingOnlyInformationDialogListener) => void;
+        showExternalOfferInformationDialog: (listener: ExternalOfferInformationDialogListener) => void;
+        showInAppMessages: (params: InAppMessageParams, listener: InAppMessageResponseListener) => void;
     }
 }
 

diff --git a/editor/engine-features/render-config.json b/editor/engine-features/render-config.json
@@ -312,10 +312,10 @@
                 "2d"
             ]
         },
-        "vendor": {
+        "vendor-google": {
             "default": false,
-            "label": "i18n:ENGINE.features.vendor.label",
-            "description": "i18n:ENGINE.features.vendor.description",
+            "label": "i18n:ENGINE.features.vendor_google.label",
+            "description": "i18n:ENGINE.features.vendor_google.description",
             "enginePlugin": false,
             "isNativeModule": true,
             "cmakeConfig": "USE_VENDOR",

diff --git a/editor/i18n/en/localization.js b/editor/i18n/en/localization.js
@@ -1043,8 +1043,8 @@ module.exports = link(mixin({
             label: "Tiled Map",
             description: "Tiled map support.",
         },
-        vendor: {
-            label: "Vendor",
+        vendor_google: {
+            label: "Vendor Google",
             description: "Vendor support.",
         },
         spine: {

diff --git a/editor/i18n/zh/localization.js b/editor/i18n/zh/localization.js
@@ -1021,9 +1021,9 @@ module.exports = link(mixin({
             label: "Tiled 地图",
             description: "Tiled 地图支持。",
         },
-        vendor: {
-            label: "Vendor",
-            description: "Vendor 支持.",
+        vendor_google: {
+            label: "Vendor Google",
+            description: "Vendor Google 支持.",
         },
         spine: {
             label: "Spine 动画",

diff --git a/native/cocos/platform/android/java/vendor/google/billing/GoogleBilling.java b/native/cocos/platform/android/java/vendor/google/billing/GoogleBilling.java
@@ -203,12 +203,8 @@ public void queryProductDetailsAsync(String[] productIds, String[] productTypes,
             Log.e(TAG, e.getMessage());
         }
     }
-    public void launchBillingFlow(BillingFlowParams params) {
-        try {
-            _billingClient.launchBillingFlow(GlobalObject.getActivity(), params);
-        } catch (RuntimeException e) {
-            Log.e(TAG, e.getMessage());
-        }
+    public BillingResult launchBillingFlow(BillingFlowParams params) {
+        return _billingClient.launchBillingFlow(GlobalObject.getActivity(), params);
     }
 
     public void queryPurchasesAsync(String type, @NonNull PurchasesResponseListener listener) {