@chiyou/minigame-framework 1.4.7 → 1.4.9

package/src/Framework/Adapter/AdAdapter/AdAdapterXiaoMi.ts

@@ -2,7 +2,7 @@ import { BannerAd_Info, BannerAd_PlatformInfo, InterstitialAd_Callback_Status, R
 import { PlatformID } from "../../Definition/SystemDefinition";
 import { LogUtils } from "../../Utils/LogUtils";
 import { FwkErrorCode } from "../../Definition/FwkErrorDefinition";
-import { AbsAdAdapter, CustomAdPosition, InterstitialAdStatus, RewardedVideoAdStatus } from "./AbsAdAdapter";
+import { AbsAdAdapter, InterstitialAdStatus, RewardedVideoAdStatus } from "./AbsAdAdapter";
 import { TimeUtils } from "../../Utils/TimeUtils";
 
 class XMBannerAd {
@@ -65,7 +65,7 @@ class XMInterstitialAd {
     constructor(adUnitId: string, callback: Function) {
         this.unitId = adUnitId;
         this.ad = null;
-        this.status = InterstitialAdStatus.Status_Init;
+        this.status = InterstitialAdStatus.Status_New;
         this.callback = callback;
         this.errorListener = null;
         this.loadListener = null;
@@ -109,7 +109,7 @@ class XMRewardedVideoAd {
     constructor(adUnitId: string, callback: Function) {
         this.unitId = adUnitId;
         this.ad = null;
-        this.status = RewardedVideoAdStatus.Status_Destroyed;
+        this.status = RewardedVideoAdStatus.Status_New;
         this.callback = callback;
         this.errorListener = null;
         this.loadListener = null;
@@ -300,7 +300,8 @@ export class AdAdapterXiaoMi extends AbsAdAdapter {
                         adUnitId: adUnitId,
                         error: err
                     });
-                    this.xmBannerAds[i].closeListener();
+
+                    this.recreateBannerAd(this.xmBannerAds[i], 30, false);
                 });
                 break;
             }
@@ -365,8 +366,7 @@ export class AdAdapterXiaoMi extends AbsAdAdapter {
                 reason: "平台API返回null",
                 adUnitId: this.xmInterstitialAd.unitId
             });
-            this.xmInterstitialAd.status = InterstitialAdStatus.Status_Error;
-            this.xmInterstitialAd.callback(InterstitialAd_Callback_Status.Status_Error);
+            this.xmInterstitialAd.callback(InterstitialAd_Callback_Status.Status_NotSupport);
             return;
         }
 
@@ -374,7 +374,7 @@ export class AdAdapterXiaoMi extends AbsAdAdapter {
         this.xmInterstitialAd.status = InterstitialAdStatus.Status_Init;
 
         this.xmInterstitialAd.errorListener = (err) => {
-            LogUtils.Instance.error(AdAdapterXiaoMi.TAG, FwkErrorCode.XiaoMi_Ad.ShowFailed, {
+            LogUtils.Instance.error(AdAdapterXiaoMi.TAG, FwkErrorCode.XiaoMi_Ad.LoadFailed, {
                 operation: "xmInterstitialAd.ad.onError",
                 reason: "插屏广告加载失败",
                 adUnitId: this.xmInterstitialAd.unitId,
@@ -382,7 +382,7 @@ export class AdAdapterXiaoMi extends AbsAdAdapter {
             });
 
             if (this.xmInterstitialAd.status !== InterstitialAdStatus.Status_Watching) {
-                this.xmInterstitialAd.status = InterstitialAdStatus.Status_Error;
+                this.xmInterstitialAd.status = InterstitialAdStatus.Status_LoadError;
                 this.xmInterstitialAd.callback(InterstitialAd_Callback_Status.Status_Error);
             }
         };
@@ -437,7 +437,7 @@ export class AdAdapterXiaoMi extends AbsAdAdapter {
                 break;
             case InterstitialAdStatus.Status_Watched:
             case InterstitialAdStatus.Status_Init:
-            case InterstitialAdStatus.Status_Error:
+            case InterstitialAdStatus.Status_LoadError:
                 this.createInterstitialAd();
                 break;
             default:
@@ -511,8 +511,7 @@ export class AdAdapterXiaoMi extends AbsAdAdapter {
                 reason: "平台API返回null",
                 adUnitId: this.xmRewardedVideoAd.unitId
             });
-            this.xmRewardedVideoAd.status = RewardedVideoAdStatus.Status_Error;
-            this.xmRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Error);
+            this.xmRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_NotSupport);
             return;
         }
 
@@ -520,7 +519,7 @@ export class AdAdapterXiaoMi extends AbsAdAdapter {
         this.xmRewardedVideoAd.status = RewardedVideoAdStatus.Status_Init;
 
         this.xmRewardedVideoAd.errorListener = (err) => {
-            LogUtils.Instance.error(AdAdapterXiaoMi.TAG, FwkErrorCode.XiaoMi_Ad.ShowFailed, {
+            LogUtils.Instance.error(AdAdapterXiaoMi.TAG, FwkErrorCode.XiaoMi_Ad.LoadFailed, {
                 operation: "xmRewardedVideoAd.ad.onError",
                 reason: "激励视频广告加载失败",
                 adUnitId: this.xmRewardedVideoAd.unitId,
@@ -528,8 +527,8 @@ export class AdAdapterXiaoMi extends AbsAdAdapter {
             });
 
             if (this.xmRewardedVideoAd.status !== RewardedVideoAdStatus.Status_Watching) {
-                this.xmRewardedVideoAd.status = RewardedVideoAdStatus.Status_Error;
-                this.xmRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Error);
+                this.xmRewardedVideoAd.status = RewardedVideoAdStatus.Status_LoadError;
+                this.xmRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_LoadError, err?.errCode, err?.errMsg);
             }
         };
         this.xmRewardedVideoAd.ad.onError(this.xmRewardedVideoAd.errorListener);
@@ -541,6 +540,7 @@ export class AdAdapterXiaoMi extends AbsAdAdapter {
             });
 
             this.xmRewardedVideoAd.status = RewardedVideoAdStatus.Status_Loaded;
+            this.xmRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_LoadSuccess);
 
             if (this.xmRewardedVideoAd.isShowImmediately) {
                 this.xmRewardedVideoAd.isShowImmediately = false;
@@ -559,9 +559,9 @@ export class AdAdapterXiaoMi extends AbsAdAdapter {
 
             this.xmRewardedVideoAd.status = RewardedVideoAdStatus.Status_Watched;
             if (isEnded) {
-                this.xmRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Complete);
+                this.xmRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Complete);
             } else {
-                this.xmRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Giveup);
+                this.xmRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Giveup);
             }
 
             this.scheduleOnce(() => {
@@ -598,7 +598,7 @@ export class AdAdapterXiaoMi extends AbsAdAdapter {
                 this._showRewardedVideoAd();
                 break;
             case RewardedVideoAdStatus.Status_Watched:
-            case RewardedVideoAdStatus.Status_Error:
+            case RewardedVideoAdStatus.Status_LoadError:
             case RewardedVideoAdStatus.Status_Init:
                 this._loadRewardedVideoAd(true); 
                 break;
@@ -641,12 +641,7 @@ export class AdAdapterXiaoMi extends AbsAdAdapter {
         this.xmRewardedVideoAd.ad.load().then(() => {
 
         }).catch((err) => {
-            LogUtils.Instance.error(AdAdapterXiaoMi.TAG, FwkErrorCode.XiaoMi_Ad.LoadFailed, {
-                operation: "xmRewardedVideoAd.ad.load",
-                reason: "激励视频广告加载失败",
-                adUnitId: this.xmRewardedVideoAd.unitId,
-                error: err
-            });
+
         });
     }
 
@@ -665,7 +660,7 @@ export class AdAdapterXiaoMi extends AbsAdAdapter {
 
                 if (this.xmRewardedVideoAd.status === RewardedVideoAdStatus.Status_StartToWatch) {
                     this.xmRewardedVideoAd.status = RewardedVideoAdStatus.Status_Watching;
-                    this.xmRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Watching);
+                    this.xmRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Watching);
                 }
             }).catch((err) => {
                 LogUtils.Instance.error(AdAdapterXiaoMi.TAG, FwkErrorCode.XiaoMi_Ad.ShowFailed, {

package/src/Framework/Adapter/AdAdapter/AdAdapterZhiFuBao.ts

@@ -16,7 +16,7 @@ class ZFBRewardedVideoAd {
     constructor(adUnitId: string, callback: Function) {
         this.unitId = adUnitId;
         this.ad = null;
-        this.status = RewardedVideoAdStatus.Status_Destroyed;
+        this.status = RewardedVideoAdStatus.Status_New;
         this.callback = callback;
         this.errorListener = null;
         this.loadListener = null;
@@ -32,6 +32,7 @@ class ZFBRewardedVideoAd {
 
             this.ad = null;
         }
+        // 平台不提供 destory方法，所以这里不处理
         this.isShowImmediately = false;
         this.status = RewardedVideoAdStatus.Status_Destroyed;
     }
@@ -106,8 +107,7 @@ export class AdAdapterZhiFuBao extends AbsAdAdapter {
                 reason: "平台API返回null",
                 adUnitId: this.zfbRewardedVideoAd.unitId
             });
-            this.zfbRewardedVideoAd.status = RewardedVideoAdStatus.Status_Error;
-            this.zfbRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Error);
+            this.zfbRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_NotSupport);
             return;
         }
 
@@ -115,7 +115,7 @@ export class AdAdapterZhiFuBao extends AbsAdAdapter {
         this.zfbRewardedVideoAd.status = RewardedVideoAdStatus.Status_Init;
 
         this.zfbRewardedVideoAd.errorListener = (err) => {
-            LogUtils.Instance.error(AdAdapterZhiFuBao.TAG, FwkErrorCode.ZhiFuBao_Ad.ShowFailed, {
+            LogUtils.Instance.error(AdAdapterZhiFuBao.TAG, FwkErrorCode.ZhiFuBao_Ad.LoadFailed, {
                 operation: "zfbRewardedVideoAd.ad.onError",
                 reason: "激励视频广告加载失败",
                 adUnitId: this.zfbRewardedVideoAd.unitId,
@@ -123,8 +123,8 @@ export class AdAdapterZhiFuBao extends AbsAdAdapter {
             });
 
             if (this.zfbRewardedVideoAd.status !== RewardedVideoAdStatus.Status_Watching) {
-                this.zfbRewardedVideoAd.status = RewardedVideoAdStatus.Status_Error;
-                this.zfbRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Error);
+                this.zfbRewardedVideoAd.status = RewardedVideoAdStatus.Status_LoadError;
+                this.zfbRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_LoadError, err?.error, err?.errorMessage);
             }
         };
         this.zfbRewardedVideoAd.ad.onError(this.zfbRewardedVideoAd.errorListener);
@@ -136,6 +136,7 @@ export class AdAdapterZhiFuBao extends AbsAdAdapter {
             });
 
             this.zfbRewardedVideoAd.status = RewardedVideoAdStatus.Status_Loaded;
+            this.zfbRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_LoadSuccess);
 
             if (this.zfbRewardedVideoAd.isShowImmediately) {
                 this.zfbRewardedVideoAd.isShowImmediately = false;
@@ -155,9 +156,9 @@ export class AdAdapterZhiFuBao extends AbsAdAdapter {
 
             this.zfbRewardedVideoAd.status = RewardedVideoAdStatus.Status_Watched;
             if (isEnded) {
-                this.zfbRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Complete);
+                this.zfbRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Complete);
             } else {
-                this.zfbRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Giveup);
+                this.zfbRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Giveup);
             }
 
             this.scheduleOnce(() => {
@@ -194,7 +195,7 @@ export class AdAdapterZhiFuBao extends AbsAdAdapter {
                 this._showRewardedVideoAd();
                 break;
             case RewardedVideoAdStatus.Status_Watched:
-            case RewardedVideoAdStatus.Status_Error:
+            case RewardedVideoAdStatus.Status_LoadError:
             case RewardedVideoAdStatus.Status_Init:
                 this._loadRewardedVideoAd(true);
                 break;
@@ -237,12 +238,7 @@ export class AdAdapterZhiFuBao extends AbsAdAdapter {
         this.zfbRewardedVideoAd.ad.load().then(() => {
 
             }).catch((err) => {
-                LogUtils.Instance.error(AdAdapterZhiFuBao.TAG, FwkErrorCode.ZhiFuBao_Ad.LoadFailed, {
-                    operation: "zfbRewardedVideoAd.ad.load",
-                    reason: "激励视频广告加载失败",
-                    adUnitId: this.zfbRewardedVideoAd.unitId,
-                    error: err
-                });
+
             });
     }
 
@@ -261,7 +257,7 @@ export class AdAdapterZhiFuBao extends AbsAdAdapter {
 
                 if (this.zfbRewardedVideoAd.status === RewardedVideoAdStatus.Status_StartToWatch) {
                     this.zfbRewardedVideoAd.status = RewardedVideoAdStatus.Status_Watching;
-                    this.zfbRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Watching);
+                    this.zfbRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Watching);
                 }
             }).catch((err) => {
                 LogUtils.Instance.error(AdAdapterZhiFuBao.TAG, FwkErrorCode.ZhiFuBao_Ad.ShowFailed, {

package/src/Framework/Definition/AdDefinition.ts

@@ -21,44 +21,6 @@ export class AdCallback {
     }
 }
 
-export class RewardedVideoAd_Record {
-    clickCount: number;
-    viewCount: number;
-    completeCount: number;
-    giveupCount: number;
-    errorCount: number;
-
-    constructor() {
-        this.clickCount = 0;
-        this.viewCount = 0;
-        this.completeCount = 0;
-        this.giveupCount = 0;
-        this.errorCount = 0;
-    }
-}
-
-export class InterstitialAd_Record {
-    viewCount: number;
-    completeCount: number;
-    errorCount: number;
-
-    constructor() {
-        this.viewCount = 0;
-        this.completeCount = 0;
-        this.errorCount = 0;
-    }
-}
-
-export class Ad_Record {
-    intersitialAdRecord: Map<InterstitialAd_Scene, InterstitialAd_Record>;
-    rewardedVideoAdRecord: Map<InterstitialAd_Scene, RewardedVideoAd_Record>;
-
-    constructor() {
-        this.intersitialAdRecord = new Map<InterstitialAd_Scene, InterstitialAd_Record>();
-        this.rewardedVideoAdRecord = new Map<InterstitialAd_Scene, RewardedVideoAd_Record>();
-    }
-}
-
 export enum InterstitialAd_Callback_Status {
     Status_NotSupport = -2,
     Status_Error = -1,
@@ -69,10 +31,11 @@ export enum InterstitialAd_Callback_Status {
 
 export enum RewardedVideoAd_Callback_Status {
     Status_NotSupport = -2,
-    Status_Error = -1,
-    Status_Complete = 0,
-    Status_Giveup = 1,
-    Status_Watching = 2,
+    Status_LoadError = -1,
+    Status_LoadSuccess = 0,
+    Status_Show_Watching = 1,
+    Status_Show_Complete = 2,
+    Status_Show_Giveup = 3,
 }
 
 export enum AdSwitchType {

package/src/Framework/Definition/AnalyticsDefinition.ts

@@ -92,7 +92,7 @@ export enum AnalyticsEventId {
     /** 广告观看完成（isEnded=true） */
     AdShowComplete = "ad_show_complete",
     /** 广告跳过（isEnded=false） */
-    AdShowSkip = "ad_show_skip",
+    AdShowGiveup = "ad_show_giveup",
 }
 
 /** 关卡结束结果 */

package/src/Framework/Definition/FwkErrorDefinition.ts

@@ -38,7 +38,7 @@ export namespace FwkErrorCode {
         export const AdapterNotFound = 4003; // 04003 - 广告适配器未创建
         export const SwitchOff = 4004;       // 04004 - 广告开关已关闭
         export const NotSupported = 4005;    // 04005 - 广告类型不支持
-        export const ShowFailed = 4006;      // 04006 - 广告展示失败
+        export const LoadFailed = 4006;      // 04006 - 广告加载失败
     }
     
     // 音频模块错误码（05xxx）
@@ -285,8 +285,8 @@ export const ErrorDescription: Record<number, string> = {
     [FwkErrorCode.Ad.AdapterNotFound]: "广告适配器未创建",
     [FwkErrorCode.Ad.SwitchOff]: "广告开关已关闭",
     [FwkErrorCode.Ad.NotSupported]: "广告类型不支持",
-    [FwkErrorCode.Ad.ShowFailed]: "广告展示失败",
-    
+    [FwkErrorCode.Ad.LoadFailed]: "广告加载失败",
+
     // 音频模块（05xxx）
     [FwkErrorCode.Audio.LoadFailed]: "音频加载失败",
     [FwkErrorCode.Audio.PlayFailed]: "音频播放失败",

package/src/Framework/Manager/AdMgr.ts

@@ -1,7 +1,7 @@
 import { math, randomRangeInt, view } from 'cc';
 import { LogUtils } from '../Utils/LogUtils';
 import { FwkErrorCode } from '../Definition/FwkErrorDefinition';
-import { AdCallback, Ad_Record, InterstitialAd_Callback_Status, InterstitialAd_Record, RewardedVideoAd_Callback_Status, RewardedVideoAd_Record, AdSwitchType, AdType, BannerAd_Info, CustomAd_Info, BannerAd_PlatformInfo, CustomAd_PlatformInfo, InterstitialAd_Scene, RewardedVideoAd_Scene, AdPlatformSettingInfo, AdPlatformUnitInfo, AdDefinition } from '../Definition/AdDefinition';
+import { AdCallback, InterstitialAd_Callback_Status, RewardedVideoAd_Callback_Status, AdSwitchType, AdType, BannerAd_Info, CustomAd_Info, BannerAd_PlatformInfo, CustomAd_PlatformInfo, InterstitialAd_Scene, RewardedVideoAd_Scene, AdPlatformSettingInfo, AdPlatformUnitInfo, AdDefinition } from '../Definition/AdDefinition';
 import { PlatformID } from '../Definition/SystemDefinition';
 import { BaseMgr } from './BaseMgr';
 import { AbsAdAdapter } from '../Adapter/AdAdapter/AbsAdAdapter';
@@ -19,6 +19,7 @@ import { AdAdapterZhiFuBao } from '../Adapter/AdAdapter/AdAdapterZhiFuBao';
 import { ServiceLocator } from '../Utils/ServiceLocator';
 import type { UserMgr } from './UserMgr';
 import type { AudioMgr } from './AudioMgr';
+import type { AnalyticsMgr } from './AnalyticsMgr';
 
 /** 广告管理器 */
 export class AdMgr extends BaseMgr {
@@ -61,16 +62,23 @@ export class AdMgr extends BaseMgr {
     /** 是否有常驻广告正在显示 */
     private static isPermanentAdShowing: boolean = false;
 
-    /** 广告记录 */
-    private static adRecord: Ad_Record = new Ad_Record();
-
     /** 内容区域顶部 */
     private static contentTop: number = 0;
     /** 内容区域底部 */
     private static contentBottom: number = 0;
 
+    private rewardedVideoAdCallbackToBusinessStatusSet: Set<RewardedVideoAd_Callback_Status> = new Set<RewardedVideoAd_Callback_Status>(
+        [
+            RewardedVideoAd_Callback_Status.Status_LoadError,
+            RewardedVideoAd_Callback_Status.Status_Show_Complete,
+            RewardedVideoAd_Callback_Status.Status_Show_Giveup,
+            RewardedVideoAd_Callback_Status.Status_Show_Watching,
+        ]
+    );
+
     private audioMgr: AudioMgr = null;
     private userMgr: UserMgr = null;
+    private _analyticsMgr: AnalyticsMgr = null;
 
     onLoad(): void {
         super.onLoad();
@@ -194,23 +202,20 @@ export class AdMgr extends BaseMgr {
             return 0;
         }
 
-        this.clearAdRecord();
-
         AdMgr.nowRunningBannerAd = "";
         AdMgr.nowRunningCustomAd = "";
         AdMgr.isPermanentAdShowing = false;
 
         AdMgr.nowInterstitialAdScene = "InterstitialAd_Scene.Scene_Invalid";
-        AdMgr.adRecord.intersitialAdRecord.set(AdMgr.nowInterstitialAdScene, new InterstitialAd_Record());
         AdMgr.interstitialAds = new Map<InterstitialAd_Scene, AdCallback>();
 
         AdMgr.interstitialAdCallback = function (res: InterstitialAd_Callback_Status) {
             if (res === InterstitialAd_Callback_Status.Status_Error) {
-                LogUtils.Instance.error(AdMgr.TAG, FwkErrorCode.Ad.ShowFailed, {
+                LogUtils.Instance.error(AdMgr.TAG, FwkErrorCode.Ad.LoadFailed, {
                     operation: "interstitialAdCallback",
                     scene: AdMgr.nowInterstitialAdScene,
                     result: InterstitialAd_Callback_Status[res],
-                    reason: "插屏广告展示失败"
+                    reason: "插屏广告加载失败"
                 });
             } else {
                 LogUtils.Instance.info(AdMgr.TAG, "插屏广告回调", {
@@ -232,20 +237,6 @@ export class AdMgr extends BaseMgr {
                 AdMgr.interstitialAd_nowIntervalCount = 1;
             }
 
-            if (AdMgr.adRecord.intersitialAdRecord !== null &&
-                AdMgr.adRecord.intersitialAdRecord.has(AdMgr.nowInterstitialAdScene) &&
-                AdMgr.adRecord.intersitialAdRecord.get(AdMgr.nowInterstitialAdScene) !== null) {
-                let record: InterstitialAd_Record = AdMgr.adRecord.intersitialAdRecord.get(AdMgr.nowInterstitialAdScene);
-                if (res === InterstitialAd_Callback_Status.Status_Watching) {
-                    record.viewCount++;
-                } else if (res === InterstitialAd_Callback_Status.Status_Error) {
-                    record.errorCount++;
-                } else if (res === InterstitialAd_Callback_Status.Status_Close) {
-                    record.completeCount++;
-                }
-                AdMgr.adRecord.intersitialAdRecord.set(AdMgr.nowInterstitialAdScene, record);
-            }
-
             if (AdMgr.interstitialAds !== null &&
                 AdMgr.interstitialAds.has(AdMgr.nowInterstitialAdScene) &&
                 AdMgr.interstitialAds.get(AdMgr.nowInterstitialAdScene) !== null) {
@@ -261,16 +252,44 @@ export class AdMgr extends BaseMgr {
         }
 
         AdMgr.nowRewardedVideoAdScene = "RewardedVideoAd_Scene.Scene_Invalid";
-        AdMgr.adRecord.rewardedVideoAdRecord.set(AdMgr.nowRewardedVideoAdScene, new RewardedVideoAd_Record());
         AdMgr.rewardedVideoAds = new Map<RewardedVideoAd_Scene, AdCallback>();
 
-        AdMgr.rewardedVideoAdCallback = function (res: RewardedVideoAd_Callback_Status) {
-            if (res === RewardedVideoAd_Callback_Status.Status_Error) {
-                LogUtils.Instance.error(AdMgr.TAG, FwkErrorCode.Ad.ShowFailed, {
+        AdMgr.rewardedVideoAdCallback = function (res: RewardedVideoAd_Callback_Status, errCode?: number, errMsg?: string) {
+            // ===== 友盟广告事件上报 =====
+            if (AdMgr.Instance._analyticsMgr === null) {
+                AdMgr.Instance._analyticsMgr = ServiceLocator.Instance.get<AnalyticsMgr>("AnalyticsMgr");
+            }
+            const analytics = AdMgr.Instance._analyticsMgr;
+            const scene = AdMgr.nowRewardedVideoAdScene;
+            switch (res) {
+                case RewardedVideoAd_Callback_Status.Status_LoadSuccess:
+                    analytics?.trackAdLoadSuccess();
+                    break;
+                case RewardedVideoAd_Callback_Status.Status_LoadError:
+                    analytics?.trackAdLoadError(errCode ?? 0, errMsg ?? '');
+                    break;
+                case RewardedVideoAd_Callback_Status.Status_Show_Watching:
+                    analytics?.trackAdShow(scene);
+                    break;
+                case RewardedVideoAd_Callback_Status.Status_Show_Complete:
+                    analytics?.trackAdShowComplete(scene);
+                    break;
+                case RewardedVideoAd_Callback_Status.Status_Show_Giveup:
+                    analytics?.trackAdShowGiveup(scene);
+                    break;
+            }
+            // ===== 友盟上报结束 =====
+
+            if (AdMgr.Instance.audioMgr === null) {
+                AdMgr.Instance.audioMgr = ServiceLocator.Instance.get<AudioMgr>("AudioMgr");
+            }
+
+            if (res === RewardedVideoAd_Callback_Status.Status_LoadError) {
+                LogUtils.Instance.error(AdMgr.TAG, FwkErrorCode.Ad.LoadFailed, {
                     operation: "rewardedVideoAdCallback",
                     scene: AdMgr.nowRewardedVideoAdScene,
                     result: RewardedVideoAd_Callback_Status[res],
-                    reason: "激励视频广告展示失败"
+                    reason: "激励视频广告加载失败"
                 });
             } else {
                 LogUtils.Instance.info(AdMgr.TAG, "激励视频广告回调", {
@@ -280,23 +299,15 @@ export class AdMgr extends BaseMgr {
                 });
             }
 
-            if (res === RewardedVideoAd_Callback_Status.Status_Watching) {
-                if (AdMgr.Instance.audioMgr === null) {
-                    AdMgr.Instance.audioMgr = ServiceLocator.Instance.get<AudioMgr>("AudioMgr");
-                }
-
+            if (res === RewardedVideoAd_Callback_Status.Status_Show_Watching) {
                 if (AdMgr.Instance.audioMgr) {
                     AdMgr.Instance.audioMgr.pauseMusic();
                 }
 
                 AdMgr.Instance.hideAllPermanentAd();
-            } else if (res === RewardedVideoAd_Callback_Status.Status_Complete ||
-                res === RewardedVideoAd_Callback_Status.Status_Giveup ||
-                res === RewardedVideoAd_Callback_Status.Status_Error) {
-                if (AdMgr.Instance.audioMgr === null) {
-                    AdMgr.Instance.audioMgr = ServiceLocator.Instance.get<AudioMgr>("AudioMgr");
-                }
-
+            } else if (res === RewardedVideoAd_Callback_Status.Status_Show_Complete ||
+                res === RewardedVideoAd_Callback_Status.Status_Show_Giveup ||
+                res === RewardedVideoAd_Callback_Status.Status_LoadError) {
                 if (AdMgr.Instance.audioMgr) {
                     AdMgr.Instance.audioMgr.resumeMusic();
                 }
@@ -304,36 +315,24 @@ export class AdMgr extends BaseMgr {
                 AdMgr.Instance.showAllPermanentAd();
             }
 
-            if (res === RewardedVideoAd_Callback_Status.Status_Complete) {
+            if (res === RewardedVideoAd_Callback_Status.Status_Show_Complete) {
                 AdMgr.interstitialAd_nowIntervalCount++;
             }
 
-            if (AdMgr.adRecord.rewardedVideoAdRecord !== null &&
-                AdMgr.adRecord.rewardedVideoAdRecord.has(AdMgr.nowRewardedVideoAdScene) &&
-                AdMgr.adRecord.rewardedVideoAdRecord.get(AdMgr.nowRewardedVideoAdScene) !== null) {
-                let record: RewardedVideoAd_Record = AdMgr.adRecord.rewardedVideoAdRecord.get(AdMgr.nowRewardedVideoAdScene);
-                if (res === RewardedVideoAd_Callback_Status.Status_Watching) {
-                    record.viewCount++;
-                } else if (res === RewardedVideoAd_Callback_Status.Status_Complete) {
-                    record.completeCount++;
-                } else if (res === RewardedVideoAd_Callback_Status.Status_Giveup) {
-                    record.giveupCount++;
-                } else if (res === RewardedVideoAd_Callback_Status.Status_Error) {
-                    record.errorCount++;
+            if (AdMgr.Instance.rewardedVideoAdCallbackToBusinessStatusSet.has(res)) {
+                if (AdMgr.rewardedVideoAds !== null &&
+                    AdMgr.rewardedVideoAds.has(AdMgr.nowRewardedVideoAdScene) &&
+                    AdMgr.rewardedVideoAds.get(AdMgr.nowRewardedVideoAdScene) !== null) {
+                    let adCallback: AdCallback = AdMgr.rewardedVideoAds.get(AdMgr.nowRewardedVideoAdScene);
+                    if (adCallback.callback && adCallback.target) {
+                        adCallback.callback.apply(adCallback.target, [res]);
+                    }
                 }
-                AdMgr.adRecord.rewardedVideoAdRecord.set(AdMgr.nowRewardedVideoAdScene, record);
             }
 
-            if (AdMgr.rewardedVideoAds !== null &&
-                AdMgr.rewardedVideoAds.has(AdMgr.nowRewardedVideoAdScene) &&
-                AdMgr.rewardedVideoAds.get(AdMgr.nowRewardedVideoAdScene) !== null) {
-                let adCallback: AdCallback = AdMgr.rewardedVideoAds.get(AdMgr.nowRewardedVideoAdScene);
-                if (adCallback.callback && adCallback.target) {
-                    adCallback.callback.apply(adCallback.target, [res]);
-                }
-            }
-
-            if (res !== RewardedVideoAd_Callback_Status.Status_Watching) {
+            if (res === RewardedVideoAd_Callback_Status.Status_LoadError ||
+                res === RewardedVideoAd_Callback_Status.Status_Show_Complete ||
+                res === RewardedVideoAd_Callback_Status.Status_Show_Giveup) {
                 AdMgr.nowRewardedVideoAdScene = "RewardedVideoAd_Scene.Scene_Invalid";
             }
         }
@@ -424,6 +423,7 @@ export class AdMgr extends BaseMgr {
                 if (portalAd !== null && portalAd.length > 0) {
                     return true;
                 }
+                return false;
             default:
                 return false;
         }
@@ -521,15 +521,14 @@ export class AdMgr extends BaseMgr {
             return;
         }
 
-        if (scene === "" || scene === "InterstitialAd_Scene.Scene_Invalid") {
+        if (this.getAdAdapter() === null) {
             return;
         }
-        AdMgr.nowInterstitialAdScene = scene;
 
-        if (!AdMgr.adRecord.intersitialAdRecord.has(AdMgr.nowInterstitialAdScene) ||
-            AdMgr.adRecord.intersitialAdRecord.get(AdMgr.nowInterstitialAdScene) === null) {
-            AdMgr.adRecord.intersitialAdRecord.set(AdMgr.nowInterstitialAdScene, new InterstitialAd_Record());
+        if (scene === "" || scene === "InterstitialAd_Scene.Scene_Invalid") {
+            return;
         }
+        AdMgr.nowInterstitialAdScene = scene;
 
         if (!this.supportAdType(AdType.Type_Interstitial)) {
             AdMgr.interstitialAdCallback(InterstitialAd_Callback_Status.Status_NotSupport);
@@ -636,14 +635,6 @@ export class AdMgr extends BaseMgr {
             return;
         }
 
-        if (!AdMgr.adRecord.rewardedVideoAdRecord.has(AdMgr.nowRewardedVideoAdScene) ||
-            AdMgr.adRecord.rewardedVideoAdRecord.get(AdMgr.nowRewardedVideoAdScene) === null) {
-            AdMgr.adRecord.rewardedVideoAdRecord.set(AdMgr.nowRewardedVideoAdScene, new RewardedVideoAd_Record());
-        }
-        let record: RewardedVideoAd_Record = AdMgr.adRecord.rewardedVideoAdRecord.get(AdMgr.nowRewardedVideoAdScene);
-        record.clickCount++;
-        AdMgr.adRecord.rewardedVideoAdRecord.set(AdMgr.nowRewardedVideoAdScene, record);
-
         if (!AdMgr.rewardedVideoAds.has(scene) ||
             (AdMgr.rewardedVideoAds.get(scene).callback !== callback && AdMgr.rewardedVideoAds.get(scene).target !== target)) {
             AdMgr.rewardedVideoAds.set(scene, new AdCallback(callback, target));
@@ -653,11 +644,11 @@ export class AdMgr extends BaseMgr {
         if (adPlatformUnitInfo.switchType === AdSwitchType.On_Debug) {
             let ranNumber = randomRangeInt(0, 100);
             if (ranNumber <= 33) {
-                AdMgr.rewardedVideoAdCallback(RewardedVideoAd_Callback_Status.Status_Error);
+                AdMgr.rewardedVideoAdCallback(RewardedVideoAd_Callback_Status.Status_LoadError);
             } else if (33 < ranNumber && ranNumber <= 66) {
-                AdMgr.rewardedVideoAdCallback(RewardedVideoAd_Callback_Status.Status_Giveup);
+                AdMgr.rewardedVideoAdCallback(RewardedVideoAd_Callback_Status.Status_Show_Giveup);
             } else {
-                AdMgr.rewardedVideoAdCallback(RewardedVideoAd_Callback_Status.Status_Complete);
+                AdMgr.rewardedVideoAdCallback(RewardedVideoAd_Callback_Status.Status_Show_Complete);
             }
         } else {
             this.getAdAdapter().showRewardedVideoAd();
@@ -782,7 +773,7 @@ export class AdMgr extends BaseMgr {
     }
 
     /** 销毁互跳广告 */
-    public destoryPortalAd(): void {
+    public destroyPortalAd(): void {
         if (!this.supportAdType(AdType.Type_Portal)) {
             return;
         }
@@ -811,7 +802,7 @@ export class AdMgr extends BaseMgr {
 
     /** 隐藏互跳广告 */
     public hidePortalAd(): void {
-        if (!this.supportAdType(AdType.Type_Custom)) {
+        if (!this.supportAdType(AdType.Type_Portal)) {
             return;
         }
 
@@ -866,20 +857,6 @@ export class AdMgr extends BaseMgr {
         this.hideCustomAd();
     }
 
-    /**
-     * 获取广告记录
-     * @return 广告记录
-     */
-    public getAdRecord(): Ad_Record {
-        return AdMgr.adRecord;
-    }
-
-    /** 清除广告记录 */
-    public clearAdRecord(): void {
-        AdMgr.adRecord.intersitialAdRecord.clear();
-        AdMgr.adRecord.rewardedVideoAdRecord.clear();
-    }
-
     /**
      * 适配合适的 UI 配置
      * @param contentHeight 内容区域高度