@jolibox/implement 1.1.32 → 1.1.34

package/src/native/rewards/check-frequency.ts

@@ -22,19 +22,31 @@ export const checkUseModalFrequency = async (config: { dailyMaxPopUps: number; m
   const res = (await getGlobalStorage('joli_coin_use_modal_frequency')) as StandardResponse<string>;
   console.log('checkUseModalFrequency', res.data);
   if (!res.data) {
-    return true;
+    return {
+      canShow: true,
+      isFirst: true
+    };
   }
 
   const fequeycies = parseFrequency(res.data);
   const todayFequencies = filterTodayTimestamps(fequeycies);
   if (todayFequencies.length >= dailyMaxPopUps) {
-    return false;
+    return {
+      canShow: false,
+      isFirst: false
+    };
   }
   const now = Date.now();
   if (now - todayFequencies[todayFequencies.length - 1] < minInterval) {
-    return false;
+    return {
+      canShow: false,
+      isFirst: false
+    };
   }
-  return true;
+  return {
+    canShow: true,
+    isFirst: false
+  };
 };
 
 export const updateUseModalFrequency = async () => {
@@ -56,18 +68,30 @@ export const checkPaymentFrequency = async (config: { dailyMaxPopUps: number; mi
   const res = (await getGlobalStorage('joli_coin_payment_frequency')) as StandardResponse<string>;
   console.log('checkPaymentFrequency', res.data);
   if (!res.data) {
-    return true;
+    return {
+      canShow: true,
+      isFirst: true
+    };
   }
   const frequencies = parseFrequency(res.data);
   const todayFequencies = filterTodayTimestamps(frequencies);
   if (todayFequencies.length >= dailyMaxPopUps) {
-    return false;
+    return {
+      canShow: false,
+      isFirst: false
+    };
   }
   const now = Date.now();
   if (now - todayFequencies[todayFequencies.length - 1] < minInterval) {
-    return false;
+    return {
+      canShow: false,
+      isFirst: false
+    };
   }
-  return true;
+  return {
+    canShow: true,
+    isFirst: false
+  };
 };
 
 /**

package/src/native/rewards/index.ts

@@ -19,6 +19,7 @@ import { innerFetch as fetch } from '../network';
 import { StandardResponse } from '@jolibox/types';
 import { context } from '@/common/context';
 import { login } from '../api/login';
+import { EventType } from '@jolibox/common';
 
 import { createEventPromiseHandler } from '@/common/rewards/registers/utils/event-listener';
 import {
@@ -32,6 +33,7 @@ import { createLoading } from '@jolibox/ui';
 import { canIUseNative } from '../api/base';
 import { applyNative } from '@jolibox/native-bridge';
 import { isUndefinedOrNull } from '@jolibox/common';
+import { track } from '../report';
 
 const modalUseFrequencyConfig = createEventPromiseHandler<
   IUseModalFrequencyConfig,
@@ -77,15 +79,33 @@ rewardsEmitter.on(UseModalEventName, async (type: 'JOLI_COIN' | 'ADS-JOLI_COIN',
       duration: 3000
     });
     const config = await modalUseFrequencyConfig.getData();
-    const canShowUseModal = await checkUseModalFrequency(config.joliCoinUseAndCharge.useJolicoin);
-    console.log('use modal show by frequency', canShowUseModal);
+    const { canShow: canShowUseModal, isFirst: isFirstUseModal } = await checkUseModalFrequency(
+      config.joliCoinUseAndCharge.useJolicoin
+    );
+    console.log('use modal show by frequency', canShowUseModal, isFirstUseModal);
     loading.hide();
+
+    // First, check for direct use: sufficient balance, auto-deduct enabled, and not the first modal.
+    const { balance } = params.userJoliCoin;
+    const useDirectly = balance >= params.joliCoinQuantity && params.enableAutoDeduct;
+    if (useDirectly && !isFirstUseModal) {
+      rewardsEmitter.emit(UseModalResultEventName, { useModalResult: 'CONFIRM' });
+      return;
+    }
+
+    // If not used directly, then check frequency control.
     if (!canShowUseModal) {
-      // return by frequency control
+      // confirm by frequency control
       rewardsEmitter.emit(UseModalResultEventName, { useModalResult: 'CONFIRM' });
       return;
     }
   }
+
+  track('unlock_popup_show', {
+    eventType: EventType.View,
+    targetType: 'game'
+  });
+
   const modal = createConfirmJolicoinModal({
     data: {
       enableAutoDeduct: params.enableAutoDeduct,
@@ -96,6 +116,12 @@ rewardsEmitter.on(UseModalEventName, async (type: 'JOLI_COIN' | 'ADS-JOLI_COIN',
       confirm: {
         text: params.confirmButtonText,
         onPress: () => {
+          track('coin_unlock_click', {
+            targetType: 'game',
+            eventType: EventType.Click,
+            coinConsume: params.joliCoinQuantity,
+            ifAutoUnlock: params.enableAutoDeduct
+          });
           rewardsEmitter.emit(UseModalResultEventName, { useModalResult: 'CONFIRM' });
           modal.destroy();
         }
@@ -103,6 +129,12 @@ rewardsEmitter.on(UseModalEventName, async (type: 'JOLI_COIN' | 'ADS-JOLI_COIN',
       cancel: {
         text: params.cancelButtonText,
         onPress: ({ type }) => {
+          if (type === 'FAILED') {
+            track('ad_unlock_click', {
+              targetType: 'game',
+              eventType: EventType.Click
+            });
+          }
           rewardsEmitter.emit(UseModalResultEventName, {
             useModalResult: (type ?? '') === 'CANCEL' ? 'CANCEL' : 'FAILED'
           });
@@ -140,7 +172,9 @@ rewardsEmitter.on(
           duration: 3000
         });
         const config = await modalUseFrequencyConfig.getData();
-        const canShowPaymentModal = await checkPaymentFrequency(config.joliCoinUseAndCharge.charge);
+        const { canShow: canShowPaymentModal } = await checkPaymentFrequency(
+          config.joliCoinUseAndCharge.charge
+        );
         console.log('use payment show by frequency', canShowPaymentModal);
         loading.hide();
         if (!canShowPaymentModal) {
@@ -164,6 +198,12 @@ rewardsEmitter.on(
         rewardsEmitter.emit(PaymentResultEventName, { paymentResult: 'FAILED' });
         return;
       }
+
+      track('coinorder_show', {
+        targetType: 'game',
+        eventType: EventType.View
+      });
+
       const modal = createPaymentJolicoinModal({
         data: {
           userJolicoin: params.userJoliCoin,
@@ -179,8 +219,19 @@ rewardsEmitter.on(
           confirm: {
             text: params.confirmButtonText,
             onPress: async (productId: string) => {
+              track('order_pay_ensure', {
+                targetType: 'game',
+                eventType: EventType.Click,
+                payWay: 'app_iap',
+                coinAmount: params.joliCoinQuantity,
+                orderPrice:
+                  balenceDetails.paymentChoices.find((choice) => choice.productId === productId)
+                    ?.totalAmountStr ?? ''
+              });
               if (!context.hostUserInfo?.isLogin) {
-                const { data } = await login();
+                const { data } = await login({
+                  skipLogin: true
+                });
                 if (!data?.isLogin) {
                   console.log('login failed');
                   return;
@@ -211,6 +262,16 @@ rewardsEmitter.on(
                 appStoreProductId
               });
               loading.hide();
+              track('order_pay_result', {
+                eventType: EventType.Other,
+                targetType: 'game',
+                payWay: 'app_iap',
+                coinAmount: params.joliCoinQuantity,
+                orderPrice:
+                  balenceDetails.paymentChoices.find((choice) => choice.productId === productId)
+                    ?.totalAmountStr ?? '',
+                payResult: code
+              });
               if (code !== 'SUCCESS') {
                 /** add timeout for google panel closed */
                 console.info('[JoliboxSDK] payment failed in payment.invokePaymet');
@@ -226,12 +287,26 @@ rewardsEmitter.on(
               rewardsEmitter.emit(PaymentResultEventName, {
                 paymentResult: (type ?? '') === 'CANCEL' ? 'CANCEL' : 'FAILED'
               });
+              track('ad_unlock_click', {
+                targetType: 'game',
+                eventType: EventType.Click
+              });
               modal.destroy();
             }
           },
           onEnableDeductChanged: async (enabled: boolean) => {
             await updateAutoDeductConfig(enabled);
           }
+        },
+        onSelect: (productId: string) => {
+          track('coinorder_click', {
+            targetType: 'game',
+            eventType: EventType.Click,
+            coinAmount: params.joliCoinQuantity,
+            orderPrice:
+              balenceDetails.paymentChoices.find((choice) => choice.productId === productId)
+                ?.totalAmountStr ?? ''
+          });
         }
       });
 
@@ -292,5 +367,8 @@ const getBalenceDetails = async (): Promise<
     mergeResponseData(response.data?.data, data);
   }
   console.info('productDetails', response.data?.data);
+  if (response.data?.data?.paymentChoices.length === 0) {
+    throw new Error('paymentChoices is empty');
+  }
   return response.data?.data;
 };

package/src/native/ui/retention.ts

@@ -1,8 +1,15 @@
 import { context } from '@/common/context';
 import { invokeNative, subscribe } from '@jolibox/native-bridge';
-import { Deferred } from '@jolibox/common';
+import { Deferred, EventType } from '@jolibox/common';
 import { createRecommendModal, IGame, IRecommendationButton, RecommendModalOnCloseParams } from '@jolibox/ui';
 import { innerFetch as fetch } from '../network';
+import { track } from '../report';
+
+enum RecommendGuideType {
+  Hide = 'Hide',
+  View = 'View',
+  Click = 'Click'
+}
 
 let exitRecommendationsCache: {
   code: string;
@@ -96,6 +103,17 @@ export async function openRetentionSchema() {
   const { gameListInfo, title, buttons } = data.data;
 
   isOpenRetentionSchema = true;
+
+  const modalContentForReport = {
+    domain: 'GAME',
+    buttons: data.data.buttons.map((btn) => `${btn.type}-${btn.text}`).join(','),
+    list: gameListInfo.games.map((game) => game.gameId).join(',')
+  };
+
+  track('RecommendedGuide', {
+    eventType: EventType.View,
+    ...modalContentForReport
+  });
   const modal = createRecommendModal({
     games: gameListInfo.games,
     title,
@@ -104,17 +122,33 @@ export async function openRetentionSchema() {
       isOpenRetentionSchema = false;
       switch (params.type) {
         case 'quit':
+          track('RecommendedGuide', {
+            eventType: EventType.Click,
+            type: 'QUIT',
+            domain: 'GAME'
+          });
           quitResultDeffer.resolve(false);
           break;
         case 'dismiss':
+          track('RecommendedGuide', {
+            eventType: EventType.Hide,
+            ...modalContentForReport
+          });
           quitResultDeffer.resolve(true);
           modal.destroy();
+
           break;
         case 'navigate':
           // TODO: 跳转游戏
           if (params.data?.game) {
             const game = params.data.game;
             openGameSchema(game);
+            track('GameItem', {
+              eventType: EventType.Click,
+              gameId: game.gameId,
+              layerName: 'RecommendedGuide',
+              domain: 'GAME'
+            });
             setTimeout(() => {
               quitResultDeffer.resolve(false);
             }, 0);
@@ -125,6 +159,10 @@ export async function openRetentionSchema() {
           break;
         default:
           // 关闭弹框，留在当前游戏
+          track('RecommendedGuide', {
+            eventType: EventType.Hide,
+            ...modalContentForReport
+          });
           quitResultDeffer.resolve(true);
           break;
       }