@chiyou/minigame-framework 1.4.7 → 1.4.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chiyou/minigame-framework",
-  "version": "1.4.7",
+  "version": "1.4.9",
   "description": "基于 Cocos Creator 3.x 的小游戏开发框架，支持多平台发布",
   "main": "src/index.ts",
   "types": "src/index.ts",

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

@@ -7,23 +7,25 @@ import { BaseMgr } from "../../Manager/BaseMgr";
 import { LogUtils } from "../../Utils/LogUtils";
 
 export enum InterstitialAdStatus {
-    Status_Error = -1,
+    Status_New = -1,
     Status_Init = 0,
     Status_Loaded = 1,
-    Status_StartToWatch = 2,
-    Status_Watching = 3,
-    Status_Watched = 4,
-    Status_Destroyed = 5,
+    Status_LoadError = 2,
+    Status_StartToWatch = 3,
+    Status_Watching = 4,
+    Status_Watched = 5,
+    Status_Destroyed = 6,
 }
 
 export enum RewardedVideoAdStatus {
-    Status_Error = -1,
+    Status_New = -1,
     Status_Init = 0,
     Status_Loaded = 1,
-    Status_StartToWatch = 2,
-    Status_Watching = 3,
-    Status_Watched = 4,
-    Status_Destroyed = 5,
+    Status_LoadError = 2,
+    Status_StartToWatch = 3,
+    Status_Watching = 4,
+    Status_Watched = 5,
+    Status_Destroyed = 6,
 }
 
 export type BannerAdPosition = {
@@ -249,13 +251,13 @@ export abstract class AbsAdAdapter extends Component {
                     top = yMargin;
                     break;
                 case CustomAd_YPosition.Center:
-                    top = 0;
+                    top = yMargin;
                     if (this.screenInfo !== null) {
                         top = this.screenInfo.windowHeight / 2 - realHeight / 2;
                     }
                     break;
                 case CustomAd_YPosition.Bottom:
-                    top = 0;
+                    top = yMargin;
                     if (this.screenInfo !== null) {
                         top = this.screenInfo.windowHeight - realHeight - yMargin;
                     }

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

@@ -16,7 +16,7 @@ class BLRewardedVideoAd {
     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;
@@ -117,8 +117,7 @@ export class AdAdapterBilibili extends AbsAdAdapter {
                 adUnitId: this.blRewardedVideoAd.unitId
             });
 
-            this.blRewardedVideoAd.status = RewardedVideoAdStatus.Status_Error;
-            this.blRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Error);
+            this.blRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_NotSupport);
             return;
         }
 
@@ -126,7 +125,7 @@ export class AdAdapterBilibili extends AbsAdAdapter {
         this.blRewardedVideoAd.status = RewardedVideoAdStatus.Status_Init;
 
         this.blRewardedVideoAd.errorListener = (err) => {
-            LogUtils.Instance.error(AdAdapterBilibili.TAG, FwkErrorCode.Bilibili_Ad.ShowFailed, {
+            LogUtils.Instance.error(AdAdapterBilibili.TAG, FwkErrorCode.Bilibili_Ad.LoadFailed, {
                 operation: "blRewardedVideoAd.ad.onError",
                 reason: "激励视频广告加载失败",
                 adUnitId: this.blRewardedVideoAd.unitId,
@@ -134,8 +133,8 @@ export class AdAdapterBilibili extends AbsAdAdapter {
             });
 
             if (this.blRewardedVideoAd.status !== RewardedVideoAdStatus.Status_Watching) {
-                this.blRewardedVideoAd.status = RewardedVideoAdStatus.Status_Error;
-                this.blRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Error);
+                this.blRewardedVideoAd.status = RewardedVideoAdStatus.Status_LoadError;
+                this.blRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_LoadError, err?.errCode, err?.errMsg);
             }
         };
         this.blRewardedVideoAd.ad.onError(this.blRewardedVideoAd.errorListener);
@@ -147,6 +146,7 @@ export class AdAdapterBilibili extends AbsAdAdapter {
             });
 
             this.blRewardedVideoAd.status = RewardedVideoAdStatus.Status_Loaded;
+            this.blRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_LoadSuccess);
 
             if (this.blRewardedVideoAd.isShowImmediately) {
                 this.blRewardedVideoAd.isShowImmediately = false;
@@ -166,9 +166,9 @@ export class AdAdapterBilibili extends AbsAdAdapter {
 
             this.blRewardedVideoAd.status = RewardedVideoAdStatus.Status_Watched;
             if (isEnded) {
-                this.blRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Complete);
+                this.blRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Complete);
             } else {
-                this.blRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Giveup);
+                this.blRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Giveup);
             }
 
             this.scheduleOnce(() => {
@@ -205,7 +205,7 @@ export class AdAdapterBilibili 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;
@@ -248,12 +248,7 @@ export class AdAdapterBilibili extends AbsAdAdapter {
         this.blRewardedVideoAd.ad.load().then(() => {
 
         }).catch((err) => {
-            LogUtils.Instance.error(AdAdapterBilibili.TAG, FwkErrorCode.Bilibili_Ad.LoadFailed, {
-                operation: "blRewardedVideoAd.ad.load",
-                reason: "激励视频广告加载失败",
-                adUnitId: this.blRewardedVideoAd.unitId,
-                error: err
-            });
+
         });
     }
 
@@ -272,7 +267,7 @@ export class AdAdapterBilibili extends AbsAdAdapter {
 
                 if (this.blRewardedVideoAd.status === RewardedVideoAdStatus.Status_StartToWatch) {
                     this.blRewardedVideoAd.status = RewardedVideoAdStatus.Status_Watching;
-                    this.blRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Watching);
+                    this.blRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Watching);
                 }
             }).catch((err) => {
                 LogUtils.Instance.error(AdAdapterBilibili.TAG, FwkErrorCode.Bilibili_Ad.ShowFailed, {

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

@@ -16,7 +16,7 @@ class TTInterstitialAd {
     constructor(adUnitId: string, callback: Function) {
         this.unitId = adUnitId;
         this.ad = null;
-        this.status = InterstitialAdStatus.Status_Destroyed;
+        this.status = InterstitialAdStatus.Status_New;
         this.callback = callback;
         this.errorListener = null;
         this.loadListener = null;
@@ -68,7 +68,7 @@ class TTRewardedVideoAd {
     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;
@@ -165,8 +165,7 @@ export class AdAdapterDouYin extends AbsAdAdapter {
                 reason: "平台API返回null",
                 adUnitId: this.ttInterstitialAd.unitId
             });
-            this.ttInterstitialAd.status = InterstitialAdStatus.Status_Error;
-            this.ttInterstitialAd.callback(InterstitialAd_Callback_Status.Status_Error);
+            this.ttInterstitialAd.callback(InterstitialAd_Callback_Status.Status_NotSupport);
             return;
         }
         
@@ -174,15 +173,15 @@ export class AdAdapterDouYin extends AbsAdAdapter {
         this.ttInterstitialAd.status = InterstitialAdStatus.Status_Init;
 
         this.ttInterstitialAd.errorListener = (err) => {
-            LogUtils.Instance.error(AdAdapterDouYin.TAG, FwkErrorCode.DouYin_Ad.ShowFailed, {
+            LogUtils.Instance.error(AdAdapterDouYin.TAG, FwkErrorCode.DouYin_Ad.LoadFailed, {
                 operation: "ttInterstitialAd.ad.onError",
-                reason: "插屏广告错误",
+                reason: "插屏广告加载失败",
                 adUnitId: this.ttInterstitialAd.unitId,
                 error: err
             });
     
             if (this.ttInterstitialAd.status !== InterstitialAdStatus.Status_Watching) {
-                this.ttInterstitialAd.status = InterstitialAdStatus.Status_Error;
+                this.ttInterstitialAd.status = InterstitialAdStatus.Status_LoadError;
                 this.ttInterstitialAd.callback(InterstitialAd_Callback_Status.Status_Error);
             }
         };
@@ -244,7 +243,7 @@ export class AdAdapterDouYin extends AbsAdAdapter {
             case InterstitialAdStatus.Status_Watched:
                 this.createInterstitialAd();
                 break;
-            case InterstitialAdStatus.Status_Error:
+            case InterstitialAdStatus.Status_LoadError:
             case InterstitialAdStatus.Status_Init:
                 this._loadInterstitialAd(true);
                 break;
@@ -277,12 +276,7 @@ export class AdAdapterDouYin extends AbsAdAdapter {
         this.ttInterstitialAd.ad.load().then(() => {
 
             }).catch((err) => {
-                LogUtils.Instance.error(AdAdapterDouYin.TAG, FwkErrorCode.DouYin_Ad.LoadFailed, {
-                    operation: "ttInterstitialAd.ad.load",
-                    reason: "插屏广告加载失败",
-                    adUnitId: this.ttInterstitialAd.unitId,
-                    error: err
-                });
+
             });
     }
 
@@ -334,8 +328,7 @@ export class AdAdapterDouYin extends AbsAdAdapter {
                 reason: "平台API返回null",
                 adUnitId: this.ttRewardedVideoAd.unitId
             });
-            this.ttRewardedVideoAd.status = RewardedVideoAdStatus.Status_Error;
-            this.ttRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Error);
+            this.ttRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_NotSupport);
             return;
         }
 
@@ -343,16 +336,16 @@ export class AdAdapterDouYin extends AbsAdAdapter {
         this.ttRewardedVideoAd.status = RewardedVideoAdStatus.Status_Init;
 
         this.ttRewardedVideoAd.errorListener = (err) => {
-            LogUtils.Instance.error(AdAdapterDouYin.TAG, FwkErrorCode.DouYin_Ad.ShowFailed, {
+            LogUtils.Instance.error(AdAdapterDouYin.TAG, FwkErrorCode.DouYin_Ad.LoadFailed, {
                 operation: "ttRewardedVideoAd.ad.onError",
-                reason: "激励视频广告错误",
+                reason: "激励视频广告加载失败",
                 adUnitId: this.ttRewardedVideoAd.unitId,
                 error: err
             });
 
             if (this.ttRewardedVideoAd.status !== RewardedVideoAdStatus.Status_Watching) {
-                this.ttRewardedVideoAd.status = RewardedVideoAdStatus.Status_Error;
-                this.ttRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Error);
+                this.ttRewardedVideoAd.status = RewardedVideoAdStatus.Status_LoadError;
+                this.ttRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_LoadError, err?.errCode, err?.errMsg);
             }
         };
         this.ttRewardedVideoAd.ad.onError(this.ttRewardedVideoAd.errorListener);
@@ -364,6 +357,7 @@ export class AdAdapterDouYin extends AbsAdAdapter {
             });
 
             this.ttRewardedVideoAd.status = RewardedVideoAdStatus.Status_Loaded;
+            this.ttRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_LoadSuccess);
 
             if (this.ttRewardedVideoAd.isShowImmediately) {
                 this.ttRewardedVideoAd.isShowImmediately = false;
@@ -383,9 +377,9 @@ export class AdAdapterDouYin extends AbsAdAdapter {
 
             this.ttRewardedVideoAd.status = RewardedVideoAdStatus.Status_Watched;
             if (isEnded) {
-                this.ttRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Complete);
+                this.ttRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Complete);
             } else {
-                this.ttRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Giveup);
+                this.ttRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Giveup);
             }
 
             this.scheduleOnce(() => {
@@ -421,7 +415,7 @@ export class AdAdapterDouYin extends AbsAdAdapter {
             case RewardedVideoAdStatus.Status_Loaded:
                 this._showRewardedVideoAd();
                 break;
-            case RewardedVideoAdStatus.Status_Error:
+            case RewardedVideoAdStatus.Status_LoadError:
             case RewardedVideoAdStatus.Status_Init:
             case RewardedVideoAdStatus.Status_Watched:
                 this._loadRewardedVideoAd(true);
@@ -465,12 +459,7 @@ export class AdAdapterDouYin extends AbsAdAdapter {
         this.ttRewardedVideoAd.ad.load().then(() => {
 
             }).catch((err) => {
-                LogUtils.Instance.error(AdAdapterDouYin.TAG, FwkErrorCode.DouYin_Ad.LoadFailed, {
-                    operation: "ttRewardedVideoAd.ad.load",
-                    reason: "激励视频广告加载失败",
-                    adUnitId: this.ttRewardedVideoAd.unitId,
-                    error: err
-                });
+
             });
     }
 
@@ -489,7 +478,7 @@ export class AdAdapterDouYin extends AbsAdAdapter {
 
                 if (this.ttRewardedVideoAd.status === RewardedVideoAdStatus.Status_StartToWatch) {
                     this.ttRewardedVideoAd.status = RewardedVideoAdStatus.Status_Watching;
-                    this.ttRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Watching);
+                    this.ttRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Watching);
                 }
             }).catch((err) => {
                 LogUtils.Instance.error(AdAdapterDouYin.TAG, FwkErrorCode.DouYin_Ad.ShowFailed, {

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

@@ -65,7 +65,7 @@ class HonorInterstitialAd {
     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 HonorRewardedVideoAd {
     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;
@@ -428,8 +428,7 @@ export class AdAdapterHonor extends AbsAdAdapter {
                 adUnitId: this.honorInterstitialAd.unitId,
                 reason: "平台API返回null"
             });
-            this.honorInterstitialAd.status = InterstitialAdStatus.Status_Error;
-            this.honorInterstitialAd.callback(InterstitialAd_Callback_Status.Status_Error);
+            this.honorInterstitialAd.callback(InterstitialAd_Callback_Status.Status_NotSupport);
             return;
         }
 
@@ -445,7 +444,7 @@ export class AdAdapterHonor extends AbsAdAdapter {
             });
 
             if (this.honorInterstitialAd.status !== InterstitialAdStatus.Status_Watching) {
-                this.honorInterstitialAd.status = InterstitialAdStatus.Status_Error;
+                this.honorInterstitialAd.status = InterstitialAdStatus.Status_LoadError;
                 this.honorInterstitialAd.callback(InterstitialAd_Callback_Status.Status_Error);
             }
         };
@@ -510,7 +509,7 @@ export class AdAdapterHonor extends AbsAdAdapter {
                 break;
             case InterstitialAdStatus.Status_Watched:
             case InterstitialAdStatus.Status_Init:
-            case InterstitialAdStatus.Status_Error:
+            case InterstitialAdStatus.Status_LoadError:
                 this._loadInterstitialAd(true);
                 break;
             default:
@@ -543,12 +542,7 @@ export class AdAdapterHonor extends AbsAdAdapter {
             .then(() => {
 
             }).catch((err) => {
-                LogUtils.Instance.error(AdAdapterHonor.TAG, FwkErrorCode.Honor_Ad.LoadFailed, {
-                    operation: "honorInterstitialAd.ad.load",
-                    adUnitId: this.honorInterstitialAd.unitId,
-                    reason: "插屏广告加载失败",
-                    error: err
-                });
+
             });
     }
 
@@ -601,8 +595,7 @@ export class AdAdapterHonor extends AbsAdAdapter {
                 adUnitId: this.honorRewardedVideoAd.unitId,
                 reason: "平台API返回null"
             });
-            this.honorRewardedVideoAd.status = RewardedVideoAdStatus.Status_Error;
-            this.honorRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Error);
+            this.honorRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_NotSupport);
             return;
         }
 
@@ -618,8 +611,8 @@ export class AdAdapterHonor extends AbsAdAdapter {
             });
 
             if (this.honorRewardedVideoAd.status !== RewardedVideoAdStatus.Status_Watching) {
-                this.honorRewardedVideoAd.status = RewardedVideoAdStatus.Status_Error;
-                this.honorRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Error);
+                this.honorRewardedVideoAd.status = RewardedVideoAdStatus.Status_LoadError;
+                this.honorRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_LoadError, err?.errCode, err?.errMsg);
             }
         };
         this.honorRewardedVideoAd.ad.onError(this.honorRewardedVideoAd.errorListener);
@@ -631,6 +624,7 @@ export class AdAdapterHonor extends AbsAdAdapter {
             });
 
             this.honorRewardedVideoAd.status = RewardedVideoAdStatus.Status_Loaded;
+            this.honorRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_LoadSuccess);
 
             if (this.honorRewardedVideoAd.isShowImmediately) {
                 this.honorRewardedVideoAd.isShowImmediately = false;
@@ -650,9 +644,9 @@ export class AdAdapterHonor extends AbsAdAdapter {
 
             this.honorRewardedVideoAd.status = RewardedVideoAdStatus.Status_Watched;
             if (isEnded) {
-                this.honorRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Complete);
+                this.honorRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Complete);
             } else {
-                this.honorRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Giveup);
+                this.honorRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Giveup);
             }
 
             this.scheduleOnce(() => {
@@ -689,7 +683,7 @@ export class AdAdapterHonor 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;
@@ -732,12 +726,7 @@ export class AdAdapterHonor extends AbsAdAdapter {
         this.honorRewardedVideoAd.ad.load().then(() => {
 
         }).catch((err) => {
-            LogUtils.Instance.error(AdAdapterHonor.TAG, FwkErrorCode.Honor_Ad.LoadFailed, {
-                operation: "honorRewardedVideoAd.ad.load()",
-                adUnitId: this.honorRewardedVideoAd.unitId,
-                reason: "激励视频广告加载失败",
-                error: err
-            });
+
         });
     }
 
@@ -756,7 +745,7 @@ export class AdAdapterHonor extends AbsAdAdapter {
 
                 if (this.honorRewardedVideoAd.status === RewardedVideoAdStatus.Status_StartToWatch) {
                     this.honorRewardedVideoAd.status = RewardedVideoAdStatus.Status_Watching;
-                    this.honorRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Watching);
+                    this.honorRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Watching);
                 }
             }).catch((err) => {
                 LogUtils.Instance.error(AdAdapterHonor.TAG, FwkErrorCode.Honor_Ad.ShowFailed, {

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

@@ -60,7 +60,7 @@ class HWInterstitialAd {
     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;
@@ -104,7 +104,7 @@ class HWRewardedVideoAd {
     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;
@@ -364,8 +364,7 @@ export class AdAdapterHuaWei extends AbsAdAdapter {
                 adUnitId: this.hwInterstitialAd.unitId,
                 reason: "平台API返回null"
             });
-            this.hwInterstitialAd.status = InterstitialAdStatus.Status_Error;
-            this.hwInterstitialAd.callback(InterstitialAd_Callback_Status.Status_Error);
+            this.hwInterstitialAd.callback(InterstitialAd_Callback_Status.Status_NotSupport);
             return;
         }
 
@@ -381,7 +380,7 @@ export class AdAdapterHuaWei extends AbsAdAdapter {
             });
 
             if (this.hwInterstitialAd.status !== InterstitialAdStatus.Status_Watching) {
-                this.hwInterstitialAd.status = InterstitialAdStatus.Status_Error;
+                this.hwInterstitialAd.status = InterstitialAdStatus.Status_LoadError;
                 this.hwInterstitialAd.callback(InterstitialAd_Callback_Status.Status_Error);
             }
         };
@@ -446,7 +445,7 @@ export class AdAdapterHuaWei extends AbsAdAdapter {
                 break;
             case InterstitialAdStatus.Status_Watched:
             case InterstitialAdStatus.Status_Init:
-            case InterstitialAdStatus.Status_Error:
+            case InterstitialAdStatus.Status_LoadError:
                 this._loadInterstitialAd(true);
                 break;
             default:
@@ -513,8 +512,7 @@ export class AdAdapterHuaWei extends AbsAdAdapter {
                 adUnitId: this.hwRewardedVideoAd.unitId,
                 reason: "平台API返回null"
             });
-            this.hwRewardedVideoAd.status = RewardedVideoAdStatus.Status_Error;
-            this.hwRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Error);
+            this.hwRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_NotSupport);
             return;
         }
 
@@ -530,8 +528,8 @@ export class AdAdapterHuaWei extends AbsAdAdapter {
             });
 
             if (this.hwRewardedVideoAd.status !== RewardedVideoAdStatus.Status_Watching) {
-                this.hwRewardedVideoAd.status = RewardedVideoAdStatus.Status_Error;
-                this.hwRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Error);
+                this.hwRewardedVideoAd.status = RewardedVideoAdStatus.Status_LoadError;
+                this.hwRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_LoadError, err?.errCode, err?.errMsg);
             }
         };
         this.hwRewardedVideoAd.ad.onError(this.hwRewardedVideoAd.errorListener);
@@ -543,6 +541,7 @@ export class AdAdapterHuaWei extends AbsAdAdapter {
             });
 
             this.hwRewardedVideoAd.status = RewardedVideoAdStatus.Status_Loaded;
+            this.hwRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_LoadSuccess);
 
             if (this.hwRewardedVideoAd.isShowImmediately) {
                 this.hwRewardedVideoAd.isShowImmediately = false;
@@ -562,9 +561,9 @@ export class AdAdapterHuaWei extends AbsAdAdapter {
 
             this.hwRewardedVideoAd.status = RewardedVideoAdStatus.Status_Watched;
             if (isEnded) {
-                this.hwRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Complete);
+                this.hwRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Complete);
             } else {
-                this.hwRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Giveup);
+                this.hwRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Giveup);
             }
 
             this.scheduleOnce(() => {
@@ -601,7 +600,7 @@ export class AdAdapterHuaWei 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;
@@ -653,7 +652,7 @@ export class AdAdapterHuaWei extends AbsAdAdapter {
         }
 
         this.hwRewardedVideoAd.status = RewardedVideoAdStatus.Status_Watching;
-        this.hwRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Watching);
+        this.hwRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Watching);
 
         LogUtils.Instance.info(AdAdapterHuaWei.TAG, "激励视频广告展示", {
             operation: "hwRewardedVideoAd.ad.show",

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

@@ -65,7 +65,7 @@ class KSInterstitialAd {
     constructor(adUnitId: string, callback: Function) {
         this.unitId = adUnitId;
         this.ad = null;
-        this.status = InterstitialAdStatus.Status_Destroyed;
+        this.status = InterstitialAdStatus.Status_New;
         this.callback = callback;
         this.errorListener = null;
         this.closeListener = null;
@@ -103,7 +103,7 @@ class KSRewardedVideoAd {
     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.closeListener = null;
@@ -358,8 +358,7 @@ export class AdAdapterKuaiShou extends AbsAdAdapter {
                 reason: "平台API返回null",
                 adUnitId: this.ksInterstitialAd.unitId
             });
-            this.ksInterstitialAd.status = InterstitialAdStatus.Status_Error;
-            this.ksInterstitialAd.callback(InterstitialAd_Callback_Status.Status_Error);
+            this.ksInterstitialAd.callback(InterstitialAd_Callback_Status.Status_NotSupport);
             return;
         }
 
@@ -367,15 +366,15 @@ export class AdAdapterKuaiShou extends AbsAdAdapter {
         this.ksInterstitialAd.status = InterstitialAdStatus.Status_Init;
 
         this.ksInterstitialAd.errorListener = (err) => {
-            LogUtils.Instance.error(AdAdapterKuaiShou.TAG, FwkErrorCode.KuaiShou_Ad.ShowFailed, {
+            LogUtils.Instance.error(AdAdapterKuaiShou.TAG, FwkErrorCode.KuaiShou_Ad.LoadFailed, {
                 operation: "ksInterstitialAd.ad.onError",
-                reason: "插屏广告错误",
+                reason: "插屏广告加载失败",
                 adUnitId: this.ksInterstitialAd.unitId,
                 error: err
             });
 
             if (this.ksInterstitialAd.status !== InterstitialAdStatus.Status_Watching) {
-                this.ksInterstitialAd.status = InterstitialAdStatus.Status_Error;
+                this.ksInterstitialAd.status = InterstitialAdStatus.Status_LoadError;
                 this.ksInterstitialAd.callback(InterstitialAd_Callback_Status.Status_Error);
             }
         };
@@ -410,7 +409,7 @@ export class AdAdapterKuaiShou extends AbsAdAdapter {
                 break;
             case InterstitialAdStatus.Status_Loaded:
             case InterstitialAdStatus.Status_Watched:
-            case InterstitialAdStatus.Status_Error:
+            case InterstitialAdStatus.Status_LoadError:
             case InterstitialAdStatus.Status_Init:
                 this._showInterstitialAd();
                 break;
@@ -486,8 +485,7 @@ export class AdAdapterKuaiShou extends AbsAdAdapter {
                 reason: "平台API返回null",
                 adUnitId: this.ksRewardedVideoAd.unitId
             });
-            this.ksRewardedVideoAd.status = RewardedVideoAdStatus.Status_Error;
-            this.ksRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Error);
+            this.ksRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_NotSupport);
             return;
         }
 
@@ -495,16 +493,16 @@ export class AdAdapterKuaiShou extends AbsAdAdapter {
         this.ksRewardedVideoAd.status = RewardedVideoAdStatus.Status_Init;
 
         this.ksRewardedVideoAd.errorListener = (err) => {
-            LogUtils.Instance.error(AdAdapterKuaiShou.TAG, FwkErrorCode.KuaiShou_Ad.ShowFailed, {
+            LogUtils.Instance.error(AdAdapterKuaiShou.TAG, FwkErrorCode.KuaiShou_Ad.LoadFailed, {
                 operation: "ksRewardedVideoAd.ad.onError",
-                reason: "激励视频广告错误",
+                reason: "激励视频广告加载失败",
                 adUnitId: this.ksRewardedVideoAd.unitId,
                 error: err
             });
 
             if (this.ksRewardedVideoAd.status !== RewardedVideoAdStatus.Status_Watching) {
-                this.ksRewardedVideoAd.status = RewardedVideoAdStatus.Status_Error;
-                this.ksRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Error);
+                this.ksRewardedVideoAd.status = RewardedVideoAdStatus.Status_LoadError;
+                this.ksRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_LoadError, err?.code, err?.msg);
             }
         };
         this.ksRewardedVideoAd.ad.onError(this.ksRewardedVideoAd.errorListener);
@@ -520,9 +518,9 @@ export class AdAdapterKuaiShou extends AbsAdAdapter {
 
             this.ksRewardedVideoAd.status = RewardedVideoAdStatus.Status_Watched;
             if (isEnded) {
-                this.ksRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Complete);
+                this.ksRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Complete);
             } else {
-                this.ksRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Giveup);
+                this.ksRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Giveup);
             }
         };
         this.ksRewardedVideoAd.ad.onClose(this.ksRewardedVideoAd.closeListener);
@@ -544,7 +542,7 @@ export class AdAdapterKuaiShou extends AbsAdAdapter {
             case RewardedVideoAdStatus.Status_StartToWatch:
                 break;
             case RewardedVideoAdStatus.Status_Watched:
-            case RewardedVideoAdStatus.Status_Error:
+            case RewardedVideoAdStatus.Status_LoadError:
             case RewardedVideoAdStatus.Status_Init:
             case RewardedVideoAdStatus.Status_Loaded:
                 this._showRewardedVideoAd();
@@ -589,7 +587,7 @@ export class AdAdapterKuaiShou extends AbsAdAdapter {
 
         // Android上无法实时触发then回调
         this.ksRewardedVideoAd.status = RewardedVideoAdStatus.Status_Watching;
-        this.ksRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Watching);
+        this.ksRewardedVideoAd.callback(RewardedVideoAd_Callback_Status.Status_Show_Watching);
 
         this.ksRewardedVideoAd.ad.show()
             .then(() => {