增加星云去重埋点

assets/script/game/data/AdData.ts

@@ -140,6 +140,7 @@ export class AdData {
      * @param type 1:激励视频完播、2:插屏展示、3:信息流展示、 4:激励视频展⽰、5:激励视频加载失败、6:开屏展示、7:banner展示、
      * 8:插屏-全屏视频 完播、9:插屏-全屏视频 展示、10:插屏-全屏视频 加载失败、11:插屏加载失败、12:信息流加载失败、13:开屏加载失败、14:banner加载失败、
      * 51:激励视频点击、52:插屏点击、53:信息流点击、54:开屏点击、55:banner点击、56:插屏-全屏视频点击
+     * 71:激励视频去重点击、72:插屏去重点击、73:信息流去重点击、74:开屏去重点击、75:banner去重点击、76:插屏-全屏视频去重点击
      */
     public async updateADLog(type, placementId, data = null) {
         let sData = null

assets/script/game/data/module/WarnTipData.ts

@@ -13,7 +13,10 @@ export default class WarnTipData {
 
     setSolution(solution) {
         if (this.curSolution != solution) {
-            this.curSolution = solution;
+            //除了状态0，其他状态只有级别比当前状态高才会赋值，避免异步导致低级状态覆盖高级状态
+            if (solution == 0 || this.curSolution < solution) {
+                this.curSolution = solution;
+            }
             mk.storage.setStorage('solution', this.curSolution);
         }
 

assets/script/game/game/FunBtns.ts

@@ -70,8 +70,8 @@ export default class FunBtns extends cc.Component {
             this.btn11.active = (gData.guideToWxData.guideToWxSwith && show);
         }
 
-        //test
-        this.btn11.active = true;
+        // //test
+        // this.btn11.active = true;
     }
 
     update() {

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATBanner.ts

@@ -19,6 +19,7 @@ export default class ATBanner extends zgSingleton {
     /**是否观看完毕 */
     public ifWatchEnd: boolean = false;
 
+    private singleClick = false;
     init() {
 
         this.ATBannerJS = cc["ATBannerJS"];
@@ -120,6 +121,8 @@ export default class ATBanner extends zgSingleton {
         // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdShow(" + placementId + ", " + callbackInfo + ")");
         let data = JSON.parse(callbackInfo);
         gData.adData.updateADLog(7, placementId, data);
+
+        this.singleClick = true;
     }
 
     /**
@@ -133,6 +136,11 @@ export default class ATBanner extends zgSingleton {
         let data = JSON.parse(callbackInfo)
         gData.adData.updateADLog(55, placementId, data);
         mk.data.sendDataEvent(DataEventId.ad_click, 'banner点击');
+
+        if (this.singleClick) {
+            this.singleClick = false;
+            gData.adData.updateADLog(75, placementId, data);
+        }
     }
 
     /** banner自动刷新成功 */

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitial.ts

@@ -20,6 +20,9 @@ export default class ATInterstitial extends zgSingleton {
     /** 是否加载完显示 */
     private ifLoadShow: boolean = false;
 
+    private singleClick = false;
+    private singleClickFull = false;
+
     /** 初始化 */
     init() {
         this.ATInterstitialJS = cc["ATInterstitialJS"];
@@ -155,9 +158,11 @@ export default class ATInterstitial extends zgSingleton {
         let type = this.checkPlacementIDType(placementId);
         if (type == 0) {
             id = 2
+            this.singleClick = true;
         }
         else if (type == 1) {
             id = 9
+            this.singleClickFull = true;
         }
         gData.adData.updateADLog(id, placementId, data);
 
@@ -167,6 +172,8 @@ export default class ATInterstitial extends zgSingleton {
         //     let price = GameM.commonData.getAdPrice(data.adsource_id, data.adsource_price)
         //     AdM.sendUROIEvent(eventID, data.id, placementId, "ad_show", "interstitial", adAdn, price)
         // }
+
+
     }
 
     onInterstitialAdClick(placementId, callbackInfo) {
@@ -180,16 +187,29 @@ export default class ATInterstitial extends zgSingleton {
         // }
 
         let id = 52;
+        let singleId = 72;
         let type = this.checkPlacementIDType(placementId);
+        let data = JSON.parse(callbackInfo)
         if (type == 0) {
             id = 52;
+            singleId = 72;
             mk.data.sendDataEvent(DataEventId.ad_click, '插屏点击');
+
+            if (this.singleClick) {
+                this.singleClick = false;
+                gData.adData.updateADLog(singleId, placementId, data);
+            }
         }
         else if (type == 1) {
             id = 56;
+            singleId = 76;
             mk.data.sendDataEvent(DataEventId.ad_click, '全屏插屏点击');
+
+            if (this.singleClickFull) {
+                this.singleClickFull = false;
+                gData.adData.updateADLog(singleId, placementId, data);
+            }
         }
-        let data = JSON.parse(callbackInfo)
         gData.adData.updateADLog(id, placementId, data);
     }
 

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNative.ts

@@ -18,7 +18,7 @@ export class ATNative extends zgSingleton {
     /** 是否加载显示 */
     private ifLoadShow: boolean = false;
 
-
+    private singleClick = false;
     /** 初始化 */
     init() {
         this.ATNativeJS = cc["ATNativeJS"];
@@ -193,6 +193,8 @@ export class ATNative extends zgSingleton {
 
         let data = JSON.parse(callbackInfo)
         gData.adData.updateADLog(3, placementId, data);
+
+        this.singleClick = true;
     }
 
     /**
@@ -205,6 +207,11 @@ export class ATNative extends zgSingleton {
         let data = JSON.parse(callbackInfo)
         gData.adData.updateADLog(53, placementId, data);
         mk.data.sendDataEvent(DataEventId.ad_click, '信息流点击');
+
+        if (this.singleClick) {
+            this.singleClick = false;
+            gData.adData.updateADLog(73, placementId, data);
+        }
     }
 }
 

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideo.ts

@@ -18,6 +18,8 @@ export class ATRewardVideo extends zgSingleton {
     public ifLoadShow: boolean = false;
     /**是否观看完毕 */
     public canGet: boolean = false;
+    /** 去重点击状态 */
+    private singleClick = false;
 
     init() {
         this.ATRewardVideoJS = cc["ATRewardVideoJS"];
@@ -129,9 +131,11 @@ export class ATRewardVideo extends zgSingleton {
                 mk.data.sendDataEventValue(DataEventId.ad_videoEcpm, `ad_video_ecpm${times}`, data.adsource_price);
             }
         }
-
+        
         //点击关闭的时候重新加载（亲测，即使在start这边 加载 也是在点击关闭时候才返回成功）
         //this.loadAd();
+
+        this.singleClick = true;
     }
 
     /**
@@ -190,6 +194,11 @@ export class ATRewardVideo extends zgSingleton {
         let data = JSON.parse(callbackInfo)
         gData.adData.updateADLog(51, placementId, data);
         mk.data.sendDataEvent(DataEventId.ad_click, '激励视频点击');
+
+        if (this.singleClick) {
+            this.singleClick = false;
+            gData.adData.updateADLog(71, placementId, data);
+        }
     }
 
     /**
@@ -200,7 +209,6 @@ export class ATRewardVideo extends zgSingleton {
      */
     onReward(placementId, callbackInfo) {
         // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onReward(" + placementId + ", " + callbackInfo + ")");
-        console.log('onReward  ');
         this.canGet = true;
     }
 }

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

@@ -187,9 +187,9 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app">
-      <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/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/apt/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/source/buildConfig/debug" 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" />