Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework

assets/script/mk/system/JsbSystem.ts

@@ -6,7 +6,7 @@
 export default class JsbSystem {
 
     /**代码桥在AS中的路径 */
-    private static _JSB_ANDROID_PATH: string = "org/cocos2dx/javascript/thridSdk/ThirdSdkMgr";
+    private static _JSB_ANDROID_PATH: string = "org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr";
     /**代码桥在IOS中的路径 */
     private static _JSB_IOS_PATH: string = "ThirdSdkMgr";
 

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

@@ -1,2 +1,4 @@
 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  : cocos2djs <= AppDelegate.cpp
+[armeabi-v7a] SharedLibrary  : libcocos2djs.so

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

@@ -74,6 +74,14 @@ public class ThirdSdkMgr {
         });
     }
 
-    //埋点相关
+    /**获取广告配置*/
+    public static String getAdvertisingChannel(){
+        //Log.d("adadasdsad",BuildConfig.WX_APP_ID);
+        //Log.d("adadasdsad",BuildConfig.TF_CHANNEL);
+        //Log.d("adadasdsad","asdadsadsa"+BuildConfig.TOPON);
+        String str = BuildConfig.TF_CHANNEL +","+BuildConfig.TOPON;
+        return str;
+    }
 
+    //埋点相关
 }