From b9680ea88faa314305787212bba5fbff365ce1b5 Mon Sep 17 00:00:00 2001 From: Wenhai Lin Date: Fri, 8 Apr 2016 15:46:47 +0800 Subject: [PATCH] Fixed crash on android --- native/cocos/network/CCDownloader-android.cpp | 41 ++----------------- native/cocos/network/CCDownloader-android.h | 3 -- .../platform/android/javaactivity-android.cpp | 2 - 3 files changed, 4 insertions(+), 42 deletions(-) diff --git a/native/cocos/network/CCDownloader-android.cpp b/native/cocos/network/CCDownloader-android.cpp index 1c71b6518c..2de26ba44b 100644 --- a/native/cocos/network/CCDownloader-android.cpp +++ b/native/cocos/network/CCDownloader-android.cpp @@ -35,8 +35,6 @@ using namespace std; -static bool _registerNativeMethods(JNIEnv* env); - unordered_map sDownloaderMap; namespace cocos2d { namespace network { @@ -171,18 +169,12 @@ namespace cocos2d { namespace network { ); coTask->task.reset(); } - - void _preloadJavaDownloaderClass() - { - if(!_registered) - { - _registered = _registerNativeMethods(JniHelper::getEnv()); - } - } } } // namespace cocos2d::network -static void _nativeOnProgress(JNIEnv *env, jclass clazz, jint id, jint taskId, jlong dl, jlong dlnow, jlong dltotal) +extern "C" +{ +JNIEXPORT void Java_org_cocos2dx_lib_Cocos2dxDownloader_nativeOnProgress(JNIEnv *env, jclass clazz, jint id, jint taskId, jlong dl, jlong dlnow, jlong dltotal) { DLLOG("_nativeOnProgress(id: %d, taskId: %d, dl: %lld, dlnow: %lld, dltotal: %lld)", id, taskId, dl, dlnow, dltotal); auto iter = sDownloaderMap.find(id); @@ -195,7 +187,7 @@ static void _nativeOnProgress(JNIEnv *env, jclass clazz, jint id, jint taskId, j downloader->_onProcess((int)taskId, (int64_t)dl, (int64_t)dlnow, (int64_t)dltotal); } -static void _nativeOnFinish(JNIEnv *env, jclass clazz, jint id, jint taskId, jint errCode, jstring errStr, jbyteArray data) +JNIEXPORT void Java_org_cocos2dx_lib_Cocos2dxDownloader_nativeOnFinish(JNIEnv *env, jclass clazz, jint id, jint taskId, jint errCode, jstring errStr, jbyteArray data) { DLLOG("_nativeOnFinish(id: %d, taskId: %d)", id, taskId); auto iter = sDownloaderMap.find(id); @@ -228,29 +220,4 @@ static void _nativeOnFinish(JNIEnv *env, jclass clazz, jint id, jint taskId, jin } downloader->_onFinish((int)taskId, (int)errCode, nullptr, buf); } - -static JNINativeMethod sMethodTable[] = { - { "nativeOnProgress", "(IIJJJ)V", (void*)_nativeOnProgress }, - { "nativeOnFinish", "(III" JARG_STR "[B)V", (void*)_nativeOnFinish }, -}; - -static bool _registerNativeMethods(JNIEnv* env) -{ - jclass clazz = env->FindClass(JCLS_DOWNLOADER); - if (clazz == NULL) - { - DLLOG("_registerNativeMethods: can't find java class:%s", JARG_DOWNLOADER); - return false; - } - if (JNI_OK != env->RegisterNatives(clazz, sMethodTable, sizeof(sMethodTable) / sizeof(sMethodTable[0]))) - { - DLLOG("_registerNativeMethods: failed"); - if (env->ExceptionCheck()) - { - env->ExceptionClear(); - } - return false; - } - return true; } - diff --git a/native/cocos/network/CCDownloader-android.h b/native/cocos/network/CCDownloader-android.h index 868f602736..75f5a3a74e 100644 --- a/native/cocos/network/CCDownloader-android.h +++ b/native/cocos/network/CCDownloader-android.h @@ -50,8 +50,5 @@ namespace cocos2d { namespace network std::unordered_map _taskMap; }; - // Load java downloader class from main thread, to void addImageAsync function - // perform in sub-thread cause java downloader unusable - void _preloadJavaDownloaderClass(); }} // namespace cocos2d::network diff --git a/native/cocos/platform/android/javaactivity-android.cpp b/native/cocos/platform/android/javaactivity-android.cpp index fe20250a33..ecd9048550 100644 --- a/native/cocos/platform/android/javaactivity-android.cpp +++ b/native/cocos/platform/android/javaactivity-android.cpp @@ -36,7 +36,6 @@ THE SOFTWARE. #include "renderer/ccGLStateCache.h" #include "2d/CCDrawingPrimitives.h" #include "platform/android/jni/JniHelper.h" -#include "network/CCDownloader-android.h" #include #include @@ -80,7 +79,6 @@ JNIEXPORT void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jo director->getEventDispatcher()->dispatchEvent(&recreatedEvent); director->setGLDefaultValues(); } - cocos2d::network::_preloadJavaDownloaderClass(); } JNIEXPORT jintArray Java_org_cocos2dx_lib_Cocos2dxActivity_getGLContextAttrs(JNIEnv* env, jobject thiz)