Procházet zdrojové kódy

全屏插屏 插屏埋点上报不准确问题修复

kaka před 4 roky
rodič
revize
35e9343c12

+ 4 - 0
assets/script/game/data/AdData.ts

@@ -127,6 +127,10 @@ export class AdData {
         }
     }
 
+    /** 更新其他广告次数
+     * @param type 1:激励视频完播、2:插屏展示、3:信息流展示、 4:激励视频展⽰、5:激励视频加载失败、6:开屏展示、7:banner展示、
+     * 8:插屏-全屏视频 完播、9:插屏-全屏视频 展示、10:插屏-全屏视频 加载失败、11:插屏加载失败、12:信息流加载失败、13:开屏加载失败、14:banner加载失败
+     */
     public updateADLog(type, placementId, data = null) {
         let sData = null
         if (!data) {

+ 42 - 13
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitial.ts

@@ -51,6 +51,29 @@ export default class ATInterstitial extends zgSingleton {
         }
     }
 
+    /**
+     * 检查当前广告类型
+     * @param placementId 当前广告id 
+     * @returns 0 插屏 1 全屏
+     */
+    checkPlacementIDType(placementId) {
+        if (cc.sys.os === cc.sys.OS_IOS) {
+            if (placementId == ATSDKMgr.topon_inter_placementId) {
+                return 0;
+            }
+            else if (placementId == ATSDKMgr.topon_fullinter_placementId) {
+                return 1;
+            }
+        } else if (cc.sys.os === cc.sys.OS_ANDROID) {
+            if (placementId == ATSDKMgr.topon_inter_placementId) {
+                return 0;
+            }
+            else if (placementId == ATSDKMgr.topon_fullinter_placementId) {
+                return 1;
+            }
+        }
+    }
+
     //广告逻辑部分------------------------------------------------------------------------
     /** 检测是否插屏预备好了 */
     hasAdReady() {
@@ -62,8 +85,6 @@ export default class ATInterstitial extends zgSingleton {
      * @param type 0 插屏 1 全屏
      */
     loadInter(type: number, ifLoadShow: boolean = false) {
-
-        this.interAdType = type;
         this.ifLoadShow = ifLoadShow;
 
         this.interAdState = InterAdState.Loading;
@@ -100,24 +121,27 @@ export default class ATInterstitial extends zgSingleton {
 
     //广告回调部分------------------------------------------------------------------------
     onInterstitialAdLoaded(placementId) {
-
         this.interAdState = InterAdState.LoadSuccess;
 
         if (this.ifLoadShow) {
-            this.showInter(this.interAdType);
+            let type = this.checkPlacementIDType(placementId);
+            this.showInter(type);
         }
     }
 
     onInterstitialAdLoadFail(placementId, errorInfo) {
         this.interAdState = InterAdState.LoadFail;
 
-        if (this.interAdType == 1) {
-            mk.tip.pop('拉取全屏视频失败,请稍后再试');
-            gData.adData.updateADLog(10, placementId);
+        let id = 11
+        let type = this.checkPlacementIDType(placementId);
+        if (type == 0) {
+            id = 11
         }
-        else if (this.interAdType == 0) {
-            gData.adData.updateADLog(11, placementId);
+        else if (type == 1) {
+            mk.tip.pop('拉取全屏视频失败,请稍后再试');
+            id = 10
         }
+        gData.adData.updateADLog(id, placementId);
     }
 
     //广告展示成功
@@ -127,10 +151,11 @@ export default class ATInterstitial extends zgSingleton {
         // // console.log('99999999   onInterstitialAdShow')
         let data = JSON.parse(callbackInfo)
         let id = 2
-        if (this.interAdType == 0) {
+        let type = this.checkPlacementIDType(placementId);
+        if (type == 0) {
             id = 2
         }
-        else if (this.interAdType == 1) {
+        else if (type == 1) {
             id = 9
         }
         gData.adData.updateADLog(id, placementId, data);
@@ -157,12 +182,16 @@ export default class ATInterstitial extends zgSingleton {
     //插屏广告关闭
     onInterstitialAdClose(placementId, callbackInfo) {
         this.interAdState = InterAdState.Close;
-        this.loadInter(this.interAdType)
 
         // //给奖励
-        if (this.interAdType == 1) {
+        let type = this.checkPlacementIDType(placementId);
+        if (type == 1) {
             let data = JSON.parse(callbackInfo);
             gData.adData.updateADLog(8, placementId, data);
+            this.loadInter(1);
+        }
+        else {
+            this.loadInter(0);
         }
     }
 }

+ 3 - 3
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/1786486690/libcocos2dx.iml

@@ -33,16 +33,16 @@
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src" isTestSource="false" />
     </content>
     <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />

+ 3 - 3
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/EasyEliminate.iml

@@ -187,16 +187,16 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app">
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />