@jolibox/implement 1.1.22 → 1.1.23

package/implement.build.log

@@ -1,9 +1,9 @@
 Invoking: npm run clean && npm run build:esm && tsc 
 
-> @jolibox/implement@1.1.22 clean
+> @jolibox/implement@1.1.23 clean
 > rimraf ./dist
 
 
-> @jolibox/implement@1.1.22 build:esm
+> @jolibox/implement@1.1.23 build:esm
 > BUILD_VERSION=$(node -p "require('./package.json').version")  node esbuild.config.js --format=esm
 

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@jolibox/implement",
   "description": "This project is Jolibox JS-SDk implement for Native && H5",
-  "version": "1.1.22",
+  "version": "1.1.23",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.1.22",
-    "@jolibox/types": "1.1.22",
-    "@jolibox/native-bridge": "1.1.22",
-    "@jolibox/ads": "1.1.22",
+    "@jolibox/common": "1.1.23",
+    "@jolibox/types": "1.1.23",
+    "@jolibox/native-bridge": "1.1.23",
+    "@jolibox/ads": "1.1.23",
     "localforage": "1.10.0",
     "@jolibox/ui": "1.0.0",
     "web-vitals": "4.2.4"

package/src/native/report/index.ts

@@ -19,7 +19,7 @@ const reportNative: ReportHandler = (event, data, webviewId) => {
     mp_version: (_data.mp_version as string) ?? ''
   };
   invokeNative('trackAsync', {
-    event,
+    event: data.tag ?? event,
     data: extra,
     webviewId
   });

package/src/native/rewards/index.ts

@@ -27,6 +27,7 @@ import {
   checkPaymentFrequency,
   updatePaymentFrequency
 } from './check-frequency';
+
 const modalUseFrequencyConfig = createEventPromiseHandler<
   IUseModalFrequencyConfig,
   typeof UseModalFrequencyEventName
@@ -34,6 +35,31 @@ const modalUseFrequencyConfig = createEventPromiseHandler<
 
 modalUseFrequencyConfig.getData();
 
+/**
+ * update config
+ */
+
+let updateEnableConfigPromise = Promise.resolve();
+
+/**
+ * 更新自动扣费配置的函数
+ * @param enabled 是否启用自动扣费
+ * @returns Promise 更新操作的Promise
+ */
+const updateAutoDeductConfig = async (enabled: boolean): Promise<void> => {
+  updateEnableConfigPromise = updateEnableConfigPromise.then(async () => {
+    await fetch('/api/joli-coin/user-config', {
+      method: 'POST',
+      appendHostCookie: true,
+      data: {
+        enableAutoDeduct: enabled
+      }
+    });
+  });
+
+  await updateEnableConfigPromise;
+};
+
 /**
  * confirm jolicoin modal
  */
@@ -71,6 +97,9 @@ rewardsEmitter.on(UseModalEventName, async (type: 'JOLI_COIN' | 'ADS-JOLI_COIN',
           });
           modal.destroy();
         }
+      },
+      onEnableDeductChanged: async (enabled: boolean) => {
+        await updateAutoDeductConfig(enabled);
       }
     }
   });
@@ -122,8 +151,16 @@ rewardsEmitter.on(
                   console.log('login failed');
                   return;
                 }
+
+                const balenceDetails = await getBalenceDetails();
+                if ((balenceDetails?.balance ?? 0) >= params.joliCoinQuantity && params.enableAutoDeduct) {
+                  rewardsEmitter.emit(PaymentResultEventName, { paymentResult: 'SUCCESS' });
+                  modal.destroy();
+                  return;
+                }
               }
               console.log('invokeNativePayment', productId);
+
               rewardsEmitter.emit(PaymentResultEventName, { paymentResult: 'SUCCESS' });
               modal.destroy();
             }
@@ -136,6 +173,9 @@ rewardsEmitter.on(
               });
               modal.destroy();
             }
+          },
+          onEnableDeductChanged: async (enabled: boolean) => {
+            await updateAutoDeductConfig(enabled);
           }
         }
       });

package/src/native/ui/retention.ts

@@ -71,32 +71,9 @@ const openGameSchema = (game: IGame) => {
   });
 };
 
-export async function openRetentionSchema() {
-  // const { data } = invokeNative('envSync');
-  // const { orientation, webviewId } = data;
-  // let joliPayload: Record<string, unknown> = {
-  //   __mpType: 'miniApp',
-  //   __transparent: true,
-  //   // set entryPath
-  //   __orientation: orientation ?? 'VERTICAL', // 默认竖屏
-  //   __showStatusBar: false,
-  //   __shouldInterupt: false,
-  //   __showCapsuleButton: false
-  // };
-  // if (webviewId) {
-  //   joliPayload = {
-  //     ...joliPayload,
-  //     __from: webviewId
-  //   };
-  // }
-
-  // const joliSource = context.encodeJoliSourceQuery(joliPayload);
-
-  // const host = context.testMode
-  //   ? `https://G32115508989327465281365749294.app.jolibox.com`
-  //   : `https://G32115508989327465281365749294.app.jolibox.com`;
-  // const retentionSchema = `${host}/recommended-guide/${context.mpId}?appId=${context.mpId}&joliSource=${joliSource}&navigationStyle=present`;
+let isOpenRetentionSchema = false;
 
+export async function openRetentionSchema() {
   const quitResultDeffer = new Deferred<boolean>();
   // 小程序不走挽留逻辑
   if (context.mpType !== 'game') {
@@ -104,6 +81,11 @@ export async function openRetentionSchema() {
     return quitResultDeffer.promise;
   }
 
+  if (isOpenRetentionSchema) {
+    quitResultDeffer.resolve(true);
+    return quitResultDeffer.promise;
+  }
+
   const data = await fetchExitRecommendations();
 
   if (data.code !== 'SUCCESS') {
@@ -113,11 +95,13 @@ export async function openRetentionSchema() {
 
   const { gameListInfo, title, buttons } = data.data;
 
+  isOpenRetentionSchema = true;
   const modal = createRecommendModal({
     games: gameListInfo.games,
     title,
     buttons,
     onClose: (params: RecommendModalOnCloseParams) => {
+      isOpenRetentionSchema = false;
       switch (params.type) {
         case 'quit':
           quitResultDeffer.resolve(false);
@@ -129,7 +113,11 @@ export async function openRetentionSchema() {
         case 'navigate':
           // TODO: 跳转游戏
           if (params.data?.game) {
-            openGameSchema(params.data.game);
+            const game = params.data.game;
+            openGameSchema(game);
+            setTimeout(() => {
+              quitResultDeffer.resolve(false);
+            }, 0);
           } else {
             quitResultDeffer.resolve(true);
           }