Переглянути джерело

[FC]:补充插屏、全屏、原生、banner广告功能;优化广告管理类逻辑

fengcong 5 роки тому
батько
коміт
079f543994
25 змінених файлів з 554 додано та 206 видалено
  1. 5 5
      assets/resources/game/prefab/uiPanel/GetPropUI.prefab
  2. 1 1
      assets/script/before/GamePlay.ts
  3. 8 6
      assets/script/before/view/GetPropUI.ts
  4. 3 0
      assets/script/game/module/login/Login.ts
  5. 25 0
      assets/script/mk/sdk/ad/IADSDKMgr.ts
  6. 9 0
      assets/script/mk/sdk/ad/IADSDKMgr.ts.meta
  7. 75 7
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATBanner.ts
  8. 113 4
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitial.ts
  9. 7 5
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNative.ts
  10. 1 0
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNativeJS.js
  11. 52 17
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideo.ts
  12. 1 0
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideoJS.js
  13. 28 16
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr.ts
  14. 0 0
      assets/script/mk/sdk/ad/zgSingleton.ts
  15. 1 1
      assets/script/mk/sdk/ad/zgSingleton.ts.meta
  16. 25 6
      assets/script/mk/system/AdSystem.ts
  17. 2 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/EasyEliminate.iml
  18. 8 8
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stderr.txt
  19. 67 67
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stdout.txt
  20. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/EasyEliminate-release.apk
  21. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/mk_framework-release.apk
  22. 3 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/wxapi/WXEntryActivity.java
  23. 2 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java
  24. 117 57
      build/jsb-link/js backups (useful for debugging)/main.index.js
  25. 1 1
      settings/project.json

+ 5 - 5
assets/resources/game/prefab/uiPanel/GetPropUI.prefab

@@ -829,8 +829,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        -501.714,
+        280,
+        205,
         0,
         0,
         0,
@@ -1030,7 +1030,7 @@
         1,
         1,
         1,
-        1
+        0
       ]
     },
     "_eulerAngles": {
@@ -1404,8 +1404,8 @@
     "clickEvents": [],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
-    "_N$transition": 0,
-    "transition": 0,
+    "_N$transition": 3,
+    "transition": 3,
     "_N$normalColor": {
       "__type__": "cc.Color",
       "r": 255,

+ 1 - 1
assets/script/before/GamePlay.ts

@@ -186,7 +186,7 @@ export default class GamePlay extends cc.Component {
             this.initEvent();
 
             this.intervalShowGuide();
-
+          
             cc.tween(this.btn_gameGetRed1).delay(0.2).to(1, { y: 60 }, { easing: "" }).to(1, { y: 0 }, { easing: "" }).union().repeatForever().start();
             cc.tween(this.btn_gameGetRed2).delay(0.4).to(1, { y: 60 }, { easing: "" }).to(1, { y: 0 }, { easing: "" }).union().repeatForever().start();
             cc.tween(this.btn_gameGetRed3).delay(0.2).to(1, { y: 60 }, { easing: "" }).to(1, { y: 0 }, { easing: "" }).union().repeatForever().start();

+ 8 - 6
assets/script/before/view/GetPropUI.ts

@@ -32,6 +32,9 @@ export default class GetPropUI extends cc.Component {
     start() {
         this.adapt();
         this.initEvent();
+        // mk.ad.showBannerAd();
+        //mk.ad.showNativeAd();
+        mk.ad.showInterAd(0);
     }
 
     // update (dt) {}
@@ -64,7 +67,6 @@ export default class GetPropUI extends cc.Component {
                 prop.active = false;
             }
         }
-
     }
 
     /**初始化事件 */
@@ -102,15 +104,15 @@ export default class GetPropUI extends cc.Component {
 
     /**观看回调 */
     watchCallBack(ifSuccess: boolean = false) {
+
+        mk.tip.pop("观看失败,无法领取奖励哦")
         if (ifSuccess) {
-            // mk.console.log("观看成功")
-            mk.tip.pop("观看成功,获取奖励")
             this.watchSuccess();
+            mk.tip.pop("观看成功,获取奖励")
         }
         else {
-            // mk.console.log("观看失败")
-            mk.tip.pop("观看失败,无法领取奖励哦")
             this.watchFailed();
+            mk.tip.pop("观看失败,无法领取奖励哦")
         }
     }
 
@@ -119,7 +121,7 @@ export default class GetPropUI extends cc.Component {
         GameMgr.Inst.sendEvent(UI_NAME.GetPropUI, `视频获取${GamePlay.Inst.curPropType}道具成功`);
         EffectMgr.Inst.addTip("观看视频成功,获得道具");
         DataMgr.Inst.updatePropNum(1, GamePlay.Inst.curPropType, 1);
-        mk.ui.closePanel("GetPropUI")
+        // mk.ui.closePanel("GetPropUI")
     }
 
     /**观看失败 */

+ 3 - 0
assets/script/game/module/login/Login.ts

@@ -65,6 +65,9 @@ export default class Login extends cc.Component {
     public login() {
         //初始化相关数据
         mk.pool.init(gData.gameData.pools);
+        //取消构造的时候自动初始化,手动初始化
+        mk.ad.init();
+        
         gData.appData.init();
         gData.adData.init();
         gData.loginData.init();

+ 25 - 0
assets/script/mk/sdk/ad/IADSDKMgr.ts

@@ -0,0 +1,25 @@
+export interface IADSDKMgr {
+
+    /** 初始化SDK */
+    initSDK();
+
+    /** 观看视频 */
+    showVideoAd();
+    
+    /** 显示插屏 */
+    showInterAd();
+    
+    /** 加载原生 */
+    loadNativeAd(type: number, show: boolean);
+    
+    /** 销毁原生 */
+    destroyNativeAd();
+    
+    /** 显示banner */
+    showBannerAd();
+    
+    /** 销毁banner */
+    destoryBanner();
+
+    showInter();
+}

+ 9 - 0
assets/script/mk/sdk/ad/IADSDKMgr.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "9f951073-d437-4549-b159-5ce7b8c1e491",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 75 - 7
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATBanner.ts

@@ -1,4 +1,4 @@
-import { zgSingleton } from "../zgSingleton";
+import { zgSingleton } from "../../zgSingleton";
 import ATSDKMgr from "./ATSDKMgr";
 
 /**
@@ -9,8 +9,10 @@ import ATSDKMgr from "./ATSDKMgr";
 export default class ATBanner extends zgSingleton {
 
     init() {
-        cc["ATNativeJS"].proxy = this;;
-        cc["ATNativeJS"].init();
+        cc["ATBannerJS"].proxy = this;
+        console.log("cc[ATBannerJS]", cc["ATBannerJS"]);
+        console.log("window[ATBannerJS]", window["ATBannerJS"]);
+        cc["ATBannerJS"].init();
         this.loadBanner();
     }
 
@@ -25,15 +27,81 @@ export default class ATBanner extends zgSingleton {
 
     /* *加载banner */
     loadBanner() {
-        cc["ATNativeJS"].loadBanner();
+        cc["ATBannerJS"].loadBanner();
     }
-    
+
     /** 显示banner */
     showBanner() {
-        cc["ATNativeJS"].showBanner();
+        cc["ATBannerJS"].showBanner();
     }
 
     destroyBanner() {
-        cc["ATNativeJS"].destroyBanner()
+        cc["ATBannerJS"].destroyBanner()
+    }
+
+    //广告回调部分------------------------------------------------------------------------
+    /**
+     * banner加载成功
+     * @param {*} placementId 广告位id
+     * @returns 
+     */
+    onBannerAdLoaded(placementId) {
+        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdLoaded(" + placementId + ")");
+    }
+
+    /**
+     *  banner加载失败
+     * @param {*} placementId 广告位id
+     * @param {*} errorInfo   错误信息
+     * @returns 
+     */
+    onBannerAdLoadFail(placementId, errorInfo) {
+        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdLoadFail(" + placementId + ", " + errorInfo + ")");
+    }
+
+    /**
+     * banner展示成功
+     * @param {*} placementId  广告位id
+     * @param {*} callbackInfo 回调信息
+     * @returns 
+     */
+    onBannerAdShow(placementId, callbackInfo) {
+        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdShow(" + placementId + ", " + callbackInfo + ")");
+    }
+
+    /**
+     * banner被点击
+     * @param {*} placementId  广告位id
+     * @param {*} callbackInfo 回调信息
+     * @returns 
+     */
+    onBannerAdClick(placementId, callbackInfo) {
+        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdClick(" + placementId + ", " + callbackInfo + ")");
+    }
+
+    /** banner自动刷新成功 */
+    onBannerAdAutoRefresh(placementId, callbackInfo) {
+        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdAutoRefresh(" + placementId + ", " + callbackInfo + ")");
+    }
+
+    /**
+     * banner自动刷新失败
+     * @param {*} placementId 广告位id
+     * @param {*} errorInfo   错误信息
+     * @returns 
+     */
+    onBannerAdAutoRefreshFail(placementId, errorInfo) {
+        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdAutoRefreshFail(" + placementId + ", " + errorInfo + ")");
+    }
+
+    /**
+     * banner关闭按钮被点击
+     * @param {*} placementId  广告位id
+     * @param {*} callbackInfo 错误信息
+     * @returns 
+     */
+    onBannerAdCloseButtonTapped(placementId, callbackInfo) {
+        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdCloseButtonTapped(" + placementId + ", " + callbackInfo + ")");
+
     }
 }

+ 113 - 4
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitial.ts

@@ -1,5 +1,5 @@
 
-import { zgSingleton } from "../zgSingleton";
+import { zgSingleton } from "../../zgSingleton";
 import ATSDKMgr from "./ATSDKMgr";
 
 /**
@@ -9,10 +9,12 @@ import ATSDKMgr from "./ATSDKMgr";
  */
 export default class ATInterstitial extends zgSingleton {
 
-   
+    private ATInterstitialJS: any;
+
     init() {
-        cc["ATInterstitialJS"].proxy = this;;
-        cc["ATInterstitialJS"].init();
+        this.ATInterstitialJS = cc["ATInterstitialJS"];
+        this.ATInterstitialJS.proxy = this;;
+        this.ATInterstitialJS.init();
         // this.loadNative();
     }
 
@@ -33,4 +35,111 @@ export default class ATInterstitial extends zgSingleton {
             }
         }
     }
+
+    /** 插屏广告
+     * @param type 0 普通插屏 1 全屏视频插屏
+     */
+    loadInter(type) {
+        // // console.log('99999999   loadInterPre  ', type)
+        // if (!this.onloadInter) {
+        //     this.onloadInter = true
+        //     // console.log('99999999   loadInter  ', type)
+        this.ATInterstitialJS.loadInter(type);
+
+        //     //FC:UROI事件
+        //     if (GameM.commonData.ifUROI) {
+        //         let eventID = EncryptUtil.randomString(32);
+        //         AdM.sendUROIEvent(eventID, '', GameM.commonData.interPlaceId, "ad_request", "interstitial", 'other', '')
+        //     }
+        // }
+    }
+
+    showInter(type) {
+        // this.interType = type
+        // if (cc["thirdVideo"].checkInterReady(type)) {
+        //     // console.log('99999999   showInter success')
+        //     cc["thirdVideo"].showInter(type);
+        // }
+        // else {
+        //     // console.log('99999999   showInter fail')
+        //     this.loadInter(type)
+        // }
+    }
+
+    //广告回调部分------------------------------------------------------------------------
+    onInterstitialAdLoaded(placementId) {
+        // this.onloadInter = false
+        // // console.log('99999999   onInterstitialAdLoaded  ')
+        // if (GameM.commonData.ifUROI) {
+        //     let eventID = EncryptUtil.randomString(32);
+        //     AdM.sendUROIEvent(eventID, '', placementId, "ad_fill", "interstitial", 'other', '')
+        // }
+    }
+
+    onInterstitialAdLoadFail(placementId, errorInfo) {
+        // this.onloadInter = false
+        // // console.log('99999999   onInterstitialAdLoadFail')
+
+        // if (placementId == GameM.commonData.fullInterPlaceId) {
+        //     EffectNode.instance.PlayTip('拉取全屏视频失败,请稍后再试')
+        //     GameM.commonData.updateADLog(10, placementId)
+        // }
+        // else if (placementId == GameM.commonData.interPlaceId) {
+        //     GameM.commonData.updateADLog(11, placementId)
+        // }
+    }
+
+    //广告展示成功
+    onInterstitialAdShow(placementId, callbackInfo) {
+        // // console.log('99999999   onInterstitialAdShow')
+        // let data = JSON.parse(callbackInfo)
+        // let id = 2
+        // if (placementId == GameM.commonData.interPlaceId) {
+        //     id = 2
+        // }
+        // else if (placementId == GameM.commonData.fullInterPlaceId) {
+        //     id = 9
+        // }
+        // GameM.commonData.updateADLog(id, placementId, data.adunit_format, data.network_type, data.network_placement_id,
+        //     data.network_firm_id, data.adsource_id, data.adsource_index, data.adsource_price,
+        //     data.adsource_isheaderbidding, data.publisher_revenue, data.precision, data.ecpm_level)
+
+        // if (GameM.commonData.ifUROI) {
+        //     let eventID = EncryptUtil.randomString(32);
+        //     let adAdn = this.getAdAdn(data.network_firm_id)
+        //     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) {
+        // let data = JSON.parse(callbackInfo)
+
+        // if (GameM.commonData.ifUROI) {
+        //     let eventID = EncryptUtil.randomString(32);
+        //     let adAdn = this.getAdAdn(data.network_firm_id)
+        //     let price = GameM.commonData.getAdPrice(data.adsource_id, data.adsource_price)
+        //     AdM.sendUROIEvent(eventID, data.id, placementId, "ad_click", "interstitial", adAdn, price)
+        // }
+    }
+
+    //插屏广告关闭
+    onInterstitialAdClose(placementId, callbackInfo) {
+        // //给奖励
+        // // console.log('AnyThinkInterstitialDemo  ', this.interType)
+        // if (placementId == GameM.commonData.fullInterPlaceId) {
+        //     GameM.commonData.showFull = false
+        //     GameM.commonData.todayFullInterTimes++
+        //     GameM.globalStorage.setStorage(STORAGE_KEY.todayFullInterTimes, GameM.commonData.todayFullInterTimes)
+        //     AdM.videoReward()
+
+        //     let data = JSON.parse(callbackInfo)
+        //     GameM.commonData.updateADLog(8, placementId, data.adunit_format, data.network_type, data.network_placement_id,
+        //         data.network_firm_id, data.adsource_id, data.adsource_index, data.adsource_price,
+        //         data.adsource_isheaderbidding, data.publisher_revenue, data.precision, data.ecpm_level)
+        // }
+
+        // this.loadInter(this.interType)
+    }
+
 }

+ 7 - 5
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNative.ts

@@ -1,4 +1,4 @@
-import { zgSingleton } from "../zgSingleton";
+import { zgSingleton } from "../../zgSingleton";
 import ATSDKMgr from "./ATSDKMgr";
 
 /**
@@ -8,10 +8,12 @@ import ATSDKMgr from "./ATSDKMgr";
  */
 export class ATNative extends zgSingleton {
 
+    private ATNativeJS: any;
     /** 初始化 */
     init() {
-        cc["ATNativeJS"].proxy = this;;
-        cc["ATNativeJS"].init();
+        this.ATNativeJS = cc["ATNativeJS"];
+        this.ATNativeJS.proxy = this;;
+        this.ATNativeJS.init();
         this.loadNative();
     }
 
@@ -30,7 +32,7 @@ export class ATNative extends zgSingleton {
      * @param show 是否加载完显示显示
      */
     loadNative(type = 0, show = false) {
-        cc["ATNativeJS"].loadNative(type, show);
+        this.ATNativeJS.loadNative(type, show);
     }
 
     /** 
@@ -38,7 +40,7 @@ export class ATNative extends zgSingleton {
      * @param type 0 弹窗里  1 最底部 2 新车奖励 3 底部小窗口
      */
     showNative(type) {
-        cc["ATNativeJS"].showNative(type);
+        this.ATNativeJS.showNative(type);
     }
 
     /**

+ 1 - 0
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNativeJS.js

@@ -145,6 +145,7 @@ var ATNativeJS = cc.Class({
         ATNativeJSSDK.showAd(this.placementID(), nativeAdViewProperty);
     },
 
+    //广告回调部分------------------------------------------------------------------------
     /**
      * 原生广告加载成功
      * @param {*} placementId 

+ 52 - 17
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideo.ts

@@ -1,4 +1,4 @@
-import { zgSingleton } from "../zgSingleton";
+import { zgSingleton } from "../../zgSingleton";
 import ATSDKMgr, { AdPlayStateType } from "./ATSDKMgr";
 
 /**
@@ -8,18 +8,22 @@ import ATSDKMgr, { AdPlayStateType } from "./ATSDKMgr";
  */
 export class ATRewardVideo extends zgSingleton {
 
-    /**是否加载成功 */
-    public ifLoadSuccess: boolean = false;
+    /** 激励视频状态 */
+    public reawardAdState: RewardAdLoadState = 0;
+    /** 是否加载完显示 */
+    public ifLoadShow: boolean = false;
     /**是否观看完毕 */
     public ifWatchEnd: boolean = false;
 
     init() {
- 
+
         cc["ATRewardVideoJS"].proxy = this;
         cc["ATRewardVideoJS"].init();
-       
+
         this.ifWatchEnd = false;
-        this.loadAd();
+        if (this.reawardAdState == RewardAdLoadState.Unload) {
+            this.loadAd();
+        }
     }
 
     /** 广告位id */
@@ -33,13 +37,22 @@ export class ATRewardVideo extends zgSingleton {
 
     /** 加载广告 */
     loadAd() {
-        this.ifLoadSuccess = false;
+        console.log("anythink === 加载激励视频广告", RewardAdLoadState[this.reawardAdState]);
+        if (this.reawardAdState == RewardAdLoadState.Loading) {
+            return;
+        }
+        this.reawardAdState = RewardAdLoadState.Loading;
         cc["ATRewardVideoJS"].loadAd("userIdKey", "userDataKey");
     }
 
     /** 显示广告 */
     showAd() {
-        this.ifLoadSuccess = true;
+        if (this.reawardAdState != RewardAdLoadState.LoadSuccess) {
+            this.loadAd();
+            this.ifLoadShow = true;
+            return;
+        }
+
         cc["ATRewardVideoJS"].showAd();
     }
 
@@ -55,15 +68,23 @@ export class ATRewardVideo extends zgSingleton {
     onRewardedVideoAdLoaded(placementId: string) {
         // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdLoaded(" + placementId + ")");
         // ATRewardVideo.getInstance().showAd()
+        console.log("anythink === 加载激励视频广告成功", this.checkReady(), RewardAdLoadState[this.reawardAdState])
+        this.reawardAdState = RewardAdLoadState.LoadSuccess;
+        if (this.ifLoadShow) {
+            this.showAd();
+            this.ifLoadShow = false;
+        }
     }
 
     /**
-     * 激励视频播放失败
+     * 激励视频加载失败
      * @param placementId 广告位id
      * @param errorInfo   错误信息
      */
     onRewardedVideoAdFailed(placementId, errorInfo) {
-        //ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
+        // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
+        console.log("anythink === 加载激励视频广告失败", RewardAdLoadState[this.reawardAdState]);
+        this.reawardAdState = RewardAdLoadState.LoadFail;
     }
 
     /**
@@ -80,9 +101,11 @@ export class ATRewardVideo extends zgSingleton {
         // HttpMgr.Inst.updateADLog(4, placementId, data.adunit_format, data.network_type, data.network_placement_id,
         //     data.network_firm_id, data.adsource_id, data.adsource_index, data.adsource_price,
         //     data.adsource_isheaderbidding, data.publisher_revenue, data.precision, data.ecpm_level);
-        gData.adData.updateData(placementId,data);
+        gData.adData.updateData(placementId, data);
 
-        this.loadAd();
+        this.reawardAdState = RewardAdLoadState.Unload;
+        //点击关闭的时候重新加载(亲测,即使在start这边 加载 也是在点击关闭时候才返回成功)
+        //this.loadAd();
     }
 
     /**
@@ -125,7 +148,7 @@ export class ATRewardVideo extends zgSingleton {
 
         if (this.ifWatchEnd) {
             // 2021/06/03(勿删)此处为星云埋点,先注释,待接口调通,恢复
-            //视频埋点结束
+            // 视频埋点结束
             // let data = JSON.parse(callbackInfo)
             // HttpMgr.Inst.updateVideoTimes(placementId, data.adunit_format, data.network_type, data.network_placement_id,
             //     data.network_firm_id, data.adsource_id, data.adsource_index, data.adsource_price,
@@ -138,10 +161,8 @@ export class ATRewardVideo extends zgSingleton {
         }
 
         this.ifWatchEnd = false;
-
-        if (!this.ifLoadSuccess) {
-            this.loadAd();
-        }
+        
+        this.loadAd();
     }
 
     /**
@@ -163,4 +184,18 @@ export class ATRewardVideo extends zgSingleton {
         // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onReward(" + placementId + ", " + callbackInfo + ")");
         this.ifWatchEnd = true;
     }
+}
+
+/** 激励视频广告加载状态 */
+export enum RewardAdLoadState {
+    /** 未加载 */
+    Unload = 0,
+    /** 加载中 */
+    Loading = 1,
+    /** 加载成功 */
+    LoadSuccess = 2,
+    /** 加载失败 */
+    LoadFail = 3,
+    /** 播放结束 */
+    PlayEnd = 4
 }

+ 1 - 0
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideoJS.js

@@ -34,6 +34,7 @@ var ATRewardVideoJS = cc.Class({
         ATRewardedVideoJSSDK.showAdInScenario(this.placementID(), "");
     },
 
+    //广告回调部分------------------------------------------------------------------------
     /** 检测广告是否加载好 */
     checkReady: function () {
         ATJSSDK.printLog("AnyThinkRewardedVideo::checkReady()   " + (ATRewardedVideoJSSDK.hasAdReady(this.placementID()) ? "Ready" : "No"));

+ 28 - 16
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr.ts

@@ -1,15 +1,14 @@
-import AdSystem from "../../../../system/AdSystem";
 import JsbSystem from "../../../../system/JsbSystem";
-import { zgSingleton } from "../zgSingleton";
+import { IADSDKMgr as IADSDKMgr } from "../../IADSDKMgr";
+import { zgSingleton } from "../../zgSingleton";
 import ATBanner from "./ATBanner";
 import ATInterstitial from "./ATInterstitial";
 import { ATNative } from "./ATNative";
 import { ATRewardVideo } from "./ATRewardVideo";
 
 const { ccclass, property } = cc._decorator;
-
 @ccclass
-export default class ATSDKMgr extends zgSingleton {
+export default class ATSDKMgr extends zgSingleton implements IADSDKMgr {
 
     /**Topon Appid */
     public static topon_android_appId = "a5f8fa5f10c661";
@@ -41,8 +40,10 @@ export default class ATSDKMgr extends zgSingleton {
         ATRewardVideo.getInstance().init();
         //初始化原生广告
         ATNative.getInstance().init();
-        // ATInterstitial.getInstance().init();
-        // ATBanner.getInstance().init();
+        // //初始化插屏广告
+        ATInterstitial.getInstance().init();
+        //初始化banner广告
+        ATBanner.getInstance().init();
     }
 
     placementID() {
@@ -57,23 +58,22 @@ export default class ATSDKMgr extends zgSingleton {
     public getAdvertiseChannel() {
         let str = JsbSystem.getAdvertisingChannel();
         if (!str) {
+            //channelId,AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner
             str = '1,a60cac090a6eb0,66b742dd0e502b64d783d9c66a9d30c4,b60cac0e43c0e1,b60cac0e4892fa,b60cac0e4d08e8,b60cac0e5754fc,b60cac0e524313';
         }
         console.log("getAdvertiseChannel..." + str);
 
         let arr = str.split(',')
-        let channel = arr[0]
-        ATSDKMgr.topon_android_appId = arr[1]
-        ATSDKMgr.topon_android_appSecret = arr[2]
-        ATSDKMgr.topon_rewardVideo_placementId = arr[3]
-        ATSDKMgr.topon_inter_placementId = arr[4]
-        ATSDKMgr.topon_native_placementId = arr[5]
-        if (arr.length >= 7 && arr[6]) {
-            ATSDKMgr.topon_fullinter_placementId = arr[6]
-        }
+        let channel = arr[0];
+        ATSDKMgr.topon_android_appId = arr[1];
+        ATSDKMgr.topon_android_appSecret = arr[2];
+        ATSDKMgr.topon_rewardVideo_placementId = arr[3];
+        ATSDKMgr.topon_inter_placementId = arr[4];
+        ATSDKMgr.topon_native_placementId = arr[5];
+        ATSDKMgr.topon_fullinter_placementId = arr[6];
+        ATSDKMgr.topon_banner_placementId = arr[7];
     }
 
-
     /**显示视频广告 */
     showVideoAd() {
         ATRewardVideo.getInstance().showAd();
@@ -115,6 +115,18 @@ export default class ATSDKMgr extends zgSingleton {
     destroyNativeAd() {
         ATNative.getInstance().destroyNative();
     }
+
+    showBannerAd() {
+        ATBanner.getInstance().showBanner();
+    }
+
+    destoryBanner() {
+        ATBanner.getInstance().destroyBanner();
+    }
+
+    showInter() {
+        ATInterstitial.getInstance().showInter(0);
+    }
 }
 
 /** 广告播放状态类型 */

+ 0 - 0
assets/script/mk/sdk/ad/toppon/zgSingleton.ts → assets/script/mk/sdk/ad/zgSingleton.ts


+ 1 - 1
assets/script/mk/sdk/ad/toppon/zgSingleton.ts.meta → assets/script/mk/sdk/ad/zgSingleton.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "32a8d1fd-ea9e-4cd1-baa9-a87b984269da",
+  "uuid": "ef0c44c0-f2eb-4c22-9b82-017fda9ced10",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

+ 25 - 6
assets/script/mk/system/AdSystem.ts

@@ -1,3 +1,4 @@
+import { IADSDKMgr } from "../sdk/ad/IADSDKMgr";
 import JsbSystem from "./JsbSystem";
 
 /**
@@ -10,13 +11,13 @@ export default class AdSystem {
     /** 构造函数
      * @param adSdk 传入当前使用广告sdk
      */
-    constructor(adSdk: any) {
+    constructor(adSdk: IADSDKMgr) {
         this.adSdk = adSdk;
-        this.init();
+        // this.init();
     }
 
     /** 广告sdk */
-    public adSdk: any = null;
+    public adSdk: IADSDKMgr = null;
 
     /** 是否显示广告 */
     public ifShowAd: boolean = true;
@@ -69,13 +70,13 @@ export default class AdSystem {
 
     /** 观看广告失败 */
     public watchAdFail() {
-        mk.console.log("watchAdFail");
+        mk.console.log("=== watchAdFail");
         this.videoAdcallBack(false);
     }
 
     /** 观看广告取消 */
     public watchAdCancel() {
-        mk.console.log("watchAdCancel");
+        mk.console.log("=== watchAdCancel");
         this.videoAdcallBack(false);
     }
 
@@ -84,7 +85,7 @@ export default class AdSystem {
      * @param placementId 广告位id
      */
     public wacthAdSuccess(placementId = '') {
-        mk.console.log("wacthAdSuccess");
+        mk.console.log("=== wacthAdSuccess");
         this.videoAdcallBack(true);
         this.initLastTimeStamp();
     }
@@ -143,4 +144,22 @@ export default class AdSystem {
         }
         return false;
     }
+
+    public showBannerAd() {
+        if (!this.ifShowAd) {
+            return;
+        }
+        this.adSdk.showBannerAd();
+    }
+
+    /**
+     * showInterAd
+     * @param type
+     */
+    public showInterAd(type: number) {
+        if (!this.ifShowAd) {
+            return;
+        }
+        this.adSdk.showInter();
+    }
 }

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

@@ -40,10 +40,10 @@
       <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/buildConfig/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/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" />

+ 8 - 8
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stderr.txt

@@ -8,6 +8,14 @@ D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos
     that->Set(context(), name_string, function);
     ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 1 warning generated.
+In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_agent.cc:6:
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+    that->Set(context(), name_string, function);
+    ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_agent.cc:675:3: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
+  message->Set(parent_env_->context(), FIXED_ONE_BYTE_STRING(isolate, "cmd"),
+  ^~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+2 warnings generated.
 In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/node.cc:6:
 D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
     that->Set(context(), name_string, function);
@@ -68,14 +76,6 @@ D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos
     process->Set(env->context(),env->events_string(), events_obj);
     ^~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 16 warnings generated.
-In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_agent.cc:6:
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-    that->Set(context(), name_string, function);
-    ^~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_agent.cc:675:3: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
-  message->Set(parent_env_->context(), FIXED_ONE_BYTE_STRING(isolate, "cmd"),
-  ^~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-2 warnings generated.
 In file included from D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/inspector_io.cc:5:
 D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger/env.h:528:5: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
     that->Set(context(), name_string, function);

+ 67 - 67
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stdout.txt

@@ -1,54 +1,55 @@
 Android NDK: WARNING: Unsupported source file extensions in D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x/cocos/Android.mk for module cocos2dx_static    
 Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/RecyclePool.hpp    
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EffectBase.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= EffectVariant.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EffectBase.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_gfx_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_renderer_manual.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_video_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_gfx_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_gfx_manual.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_webview_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SocketIO.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= WebSocketServer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_audioengine_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_renderer_auto.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SocketIO.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_websocket_server.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= tinysndfile.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_websocket.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_socketio.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_audioengine_auto.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= mp3reader.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_spine_manual.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_socketio.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_websocket.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_particle_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2djs <= main.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_spine_manual.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= WebSocket-libwebsockets.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= cocos2d.cpp
 [armeabi-v7a] Compile++ arm  : cocos2djs <= AppDelegate.cpp
-[armeabi-v7a] Compile++ arm  : cocos2djs <= jsb_module_register.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCSAXParser.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCImage.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= WebSocket-libwebsockets.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_dragonbones_manual.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCSAXParser.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= MathUtil.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCImage.cpp
+[armeabi-v7a] Compile++ arm  : cocos2djs <= jsb_module_register.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCGeometry.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCVertex.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Mat4.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCFileUtils.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Quaternion.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Vec2.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCFileUtils.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Vec3.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_dragonbones_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Vec4.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Mat3.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_dragonbones_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCAutoreleasePool.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCData.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCRef.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCConfiguration.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= base64.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_spine_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= TGAlib.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccCArray.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_spine_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCValue.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccCArray.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCThreadPool.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ZipUtils.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccTypes.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccRandom.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccTypes.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= etc1.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= etc2.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ccUtils.cpp
@@ -57,8 +58,8 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCLog.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCGLUtils.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCScheduler.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCRenderTexture.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= csscolorparser.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCRenderTexture.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= LocalStorage-android.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCDownloader.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCDownloader-android.cpp
@@ -66,8 +67,8 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Uri.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= HttpClient-android.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_network_auto.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= JavaScriptJavaBridge.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_classtype.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_extension_auto.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= config.cpp
@@ -76,44 +77,44 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= MappingUtils.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_conversions.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_cocos2dx_network_manual.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= HandleObject.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= RefCounter.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= HandleObject.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_platform_android.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_xmlhttprequest.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Value.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= State.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_xmlhttprequest.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Class.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ObjectWrap.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= xxtea.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Class.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Object.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= xxtea.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_global.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= tinyxml2.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ioapi_mem.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= jsb_global.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ScriptEngine.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Utils.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ScriptEngine.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EventDispatcher.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ioapi.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= unzip.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= EventDispatcher.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ConvertUTFWrapper.cpp
 [armeabi-v7a] Compile arm    : cocos2dx_static <= ConvertUTF.c
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ConvertUTFWrapper.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= edtaa3func.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= SHA1.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= EditBox-android.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCTTFTypes.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCFontAtlas.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCTTFTypes.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCFontFreetype.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCTTFLabelAtlasCache.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= util.cc
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCLabelLayout.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= env.cc
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCTTFLabelRenderer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= CCLabelLayout.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_socket.cc
 [armeabi-v7a] Compile arm    : cocos2dx_static <= http_parser.c
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= node.cc
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= node_debug_options.cc
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= GFXUtils.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= node_debug_options.cc
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_agent.cc
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_socket_server.cc
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= node.cc
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= inspector_io.cc
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Types.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= FrameBuffer.cpp
@@ -122,8 +123,8 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= GraphicsHandle.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= IndexBuffer.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderBuffer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Program.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderTarget.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= Program.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= State.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Texture.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Texture2D.cpp
@@ -135,31 +136,31 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Camera.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Light.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Model.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= BaseRenderer.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Pass.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= View.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= BaseRenderer.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Scene.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Technique.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ProgramLib.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= AssemblerBase.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MaskAssembler.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= CustomAssembler.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderDataList.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderData.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= MaskAssembler.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Assembler.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ForwardRenderer.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderData.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderDataList.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= TiledMapAssembler.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= AssemblerSprite.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SimpleSprite2D.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= SimpleSprite3D.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= SimpleSprite2D.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= SlicedSprite3D.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= SlicedSprite2D.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= MeshAssembler.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= Particle3DAssembler.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= MeshBuffer.cpp
-[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ModelBatcher.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= StencilManager.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= ParallelTask.cpp
+[armeabi-v7a] Compile++ arm  : cocos2dx_static <= ModelBatcher.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= MemPool.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= NodeMemPool.cpp
 [armeabi-v7a] Compile++ arm  : cocos2dx_static <= RenderFlow.cpp
@@ -173,24 +174,24 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoder.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderProvider.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioEngine.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioEngine-inl.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderSLES.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderOgg.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioEngine-inl.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderMp3.cpp
 [armeabi-v7a] Compile++ arm  : cocos_extension_static <= AssetsManagerEx.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioResamplerCubic.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderWav.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioDecoderMp3.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioResampler.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioResamplerCubic.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= PcmBufferProvider.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmData.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= PcmAudioPlayer.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioPlayerProvider.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmData.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= UrlAudioPlayer.cpp
+[armeabi-v7a] Compile++ thumb: audioengine_static <= AudioPlayerProvider.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioMixerController.cpp
-[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmAudioService.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= Track.cpp
-[armeabi-v7a] Compile thumb  : audioengine_static <= format.c
+[armeabi-v7a] Compile++ thumb: audioengine_static <= PcmAudioService.cpp
 [armeabi-v7a] Compile++ thumb: audioengine_static <= AudioMixer.cpp
+[armeabi-v7a] Compile thumb  : audioengine_static <= format.c
 [armeabi-v7a] Compile++ thumb: audioengine_static <= minifloat.cpp
 [armeabi-v7a] Compile thumb  : audioengine_static <= primitives.c
 [armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_helper.cpp
@@ -200,24 +201,23 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : editor_support_static <= middleware-adapter.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Animation.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= IOTypedArray.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= TypedArrayPool.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationState.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= MiddlewareManager.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= TypedArrayPool.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationStateData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= MiddlewareManager.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Atlas.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AtlasAttachmentLoader.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= ParticleSimulator.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Attachment.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= ParticleSimulator.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AttachmentLoader.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AttachmentTimeline.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_editor_support_auto.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= Bone.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= BoneData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= BoundingBoxAttachment.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= Bone.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= ClippingAttachment.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= ColorTimeline.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Constraint.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= jsb_cocos2dx_particle_auto.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= ConstraintData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= CurveTimeline.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= DeformTimeline.cpp
@@ -262,8 +262,8 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : editor_support_static <= TransformConstraintTimeline.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= TranslateTimeline.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Triangulator.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= TwoColorTimeline.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Updatable.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= TwoColorTimeline.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= VertexAttachment.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= VertexEffect.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AttachmentVertices.cpp
@@ -289,35 +289,35 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : editor_support_static <= BaseObject.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Slot.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Point.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= EventObject.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= Transform.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= EventObject.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationConfig.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= DragonBones.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= BoundingBoxData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= CanvasData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= DragonBones.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AnimationData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= CanvasData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= BaseFactory.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= ConstraintData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= ArmatureData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= DisplayData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= DragonBonesData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= SkinData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= TextureAtlasData.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= DragonBonesData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= UserData.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= DataParser.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= BinaryDataParser.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= CCTextureAtlasData.cpp
-[armeabi-v7a] Compile++ arm  : editor_support_static <= JSONDataParser.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= CCArmatureDisplay.cpp
+[armeabi-v7a] Compile++ arm  : editor_support_static <= JSONDataParser.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= CCSlot.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= CCFactory.cpp
 [armeabi-v7a] Compile arm    : vorbisidec <= bitwise.c
-[armeabi-v7a] Compile++ arm  : editor_support_static <= ArmatureCache.cpp
 [armeabi-v7a] Compile arm    : vorbisidec <= dsp.c
 [armeabi-v7a] Compile++ arm  : editor_support_static <= ArmatureCacheMgr.cpp
-[armeabi-v7a] Compile arm    : vorbisidec <= codebook.c
+[armeabi-v7a] Compile++ arm  : editor_support_static <= ArmatureCache.cpp
 [armeabi-v7a] Compile arm    : vorbisidec <= floor0.c
 [armeabi-v7a] Compile arm    : vorbisidec <= floor1.c
+[armeabi-v7a] Compile arm    : vorbisidec <= codebook.c
 [armeabi-v7a] Compile arm    : vorbisidec <= floor_lookup.c
 [armeabi-v7a] Compile++ arm  : editor_support_static <= CCArmatureCacheDisplay.cpp
 [armeabi-v7a] Compile arm    : vorbisidec <= info.c
@@ -326,20 +326,20 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile arm    : vorbisidec <= misc.c
 [armeabi-v7a] Compile arm    : vorbisidec <= mdct.c
 [armeabi-v7a] Compile arm    : vorbisidec <= res012.c
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_normalize.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_alias_reduction.cpp
 [armeabi-v7a] Compile++ arm  : editor_support_static <= AttachUtil.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_normalize.cpp
 [armeabi-v7a] Compile arm    : vorbisidec <= vorbisfile.c
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_alias_reduction.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_crc.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_decode_header.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_decode_huff_cw.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_getbits.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_dequantize_sample.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_framedecoder.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_get_main_data_size.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_framedecoder.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_get_side_info.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_get_scale_factors.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_mpeg2_get_scale_data.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_get_scale_factors.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_mpeg2_get_scale_factors.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_mpeg2_stereo_proc.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_huffman_decoding.cpp
@@ -351,25 +351,25 @@ Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/Recycl
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_poly_phase_synthesis.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_equalizer.cpp
 [armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_seek_synch.cpp
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_stereo_proc.cpp
 [armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_polyphase_filter_window_gcc.s
-[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_reorder.cpp
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_stereo_proc.cpp
 [armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_mdct_18_gcc.s
+[armeabi-v7a] Compile++ arm  : pvmp3dec <= pvmp3_reorder.cpp
 [armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_dct_9_gcc.s
 [armeabi-v7a] Compile arm    : pvmp3dec <= pvmp3_dct_16_gcc.s
 [armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCDevice-android.cpp
-[armeabi-v7a] Compile thumb  : cpufeatures <= cpu-features.c
 [armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCFileUtils-android.cpp
+[armeabi-v7a] Compile thumb  : cpufeatures <= cpu-features.c
 [armeabi-v7a] StaticLibrary  : libextension.a
 [armeabi-v7a] StaticLibrary  : libaudioengine.a
 [armeabi-v7a] StaticLibrary  : libvorbisidec.a
-[armeabi-v7a] StaticLibrary  : libpvmp3dec.a
 [armeabi-v7a] StaticLibrary  : libcpufeatures.a
 [armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= JniHelper.cpp
+[armeabi-v7a] StaticLibrary  : libpvmp3dec.a
 [armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCApplication-android.cpp
-[armeabi-v7a] StaticLibrary  : libeditorsupport.a
 [armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= JniImp.cpp
-[armeabi-v7a] StaticLibrary  : libcocos2d.a
+[armeabi-v7a] StaticLibrary  : libeditorsupport.a
 [armeabi-v7a] Compile++ thumb: cocos2dxandroid_static <= CCCanvasRenderingContext2D-android.cpp
+[armeabi-v7a] StaticLibrary  : libcocos2d.a
 [armeabi-v7a] StaticLibrary  : libcocos2dandroid.a
 [armeabi-v7a] SharedLibrary  : libcocos2djs.so

BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/EasyEliminate-release.apk


BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/mk_framework-release.apk


+ 3 - 2
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/wxapi/WXEntryActivity.java

@@ -166,8 +166,9 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
 
     //分享相关---------------------------------------------------------------------------------------
     /** 分享图 */
-    public void sharePic(){
-        Bitmap bmp = BitmapFactory.decodeResource(getResources(), R.drawable.send_img);
+    public void sharePic(Context context){
+        //如果这段代码放置在AppActivity中则不需要context 直接getResources()
+        Bitmap bmp = BitmapFactory.decodeResource(context.getResources(), R.drawable.send_img);
         WXImageObject imgObj = new WXImageObject(bmp);
 
         WXMediaMessage msg = new WXMediaMessage();

+ 2 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java

@@ -28,6 +28,7 @@ public class ThirdSdkMgr {
 
     public static void regToWx()
     {
+
         WXEntryActivity.getInstance().regToWx(ThirdSdkMgr.appActivity);
     }
 
@@ -45,7 +46,7 @@ public class ThirdSdkMgr {
     public static  void sharePic()
     {
         Log.d("=== Android","微信分享大图");
-        WXEntryActivity.getInstance().sharePic();
+        WXEntryActivity.getInstance().sharePic(ThirdSdkMgr.appActivity);
     }
 
     /**

Різницю між файлами не показано, бо вона завелика
+ 117 - 57
build/jsb-link/js backups (useful for debugging)/main.index.js


+ 1 - 1
settings/project.json

@@ -36,6 +36,6 @@
       "enable": false
     }
   },
-  "last-module-event-record-time": 1623807966016,
+  "last-module-event-record-time": 1624417441258,
   "start-scene": "6f522a54-3e0e-404d-a06c-bec8b4307c95"
 }

Деякі файли не було показано, через те що забагато файлів було змінено