From b46209b4e716eb5a30f045ea53a46aa36dc538d0 Mon Sep 17 00:00:00 2001 From: W-MTZing <39689887+W-MTZing@users.noreply.github.com> Date: Wed, 5 Sep 2018 13:43:28 +0800 Subject: [PATCH] adjust c++ call java function rename (#1498) --- native/cocos/platform/CCFileUtils.cpp | 4 ++-- native/cocos/platform/android/CCFileUtils-android.cpp | 2 +- .../android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java | 6 +++--- native/cocos/platform/android/jni/JniImp.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/native/cocos/platform/CCFileUtils.cpp b/native/cocos/platform/CCFileUtils.cpp index 52889eeff7..2d802b3293 100644 --- a/native/cocos/platform/CCFileUtils.cpp +++ b/native/cocos/platform/CCFileUtils.cpp @@ -811,7 +811,7 @@ std::string FileUtils::fullPathForFilename(const std::string &filename) const } if(isPopupNotify()){ - CCLOG("cocos2d: fullPathForFilename: No file found at %s. Possible missing file.", filename.c_str()); + CCLOG("fullPathForFilename: No file found at %s. Possible missing file.", filename.c_str()); } // The file wasn't found, return empty string. @@ -983,7 +983,7 @@ void FileUtils::loadFilenameLookupDictionaryFromFile(const std::string &filename int version = metadata["version"].asInt(); if (version != 1) { - CCLOG("cocos2d: ERROR: Invalid filenameLookup dictionary version: %d. Filename: %s", version, filename.c_str()); + CCLOG("ERROR: Invalid filenameLookup dictionary version: %d. Filename: %s", version, filename.c_str()); return; } setFilenameLookupDictionary( dict["filenames"].asValueMap()); diff --git a/native/cocos/platform/android/CCFileUtils-android.cpp b/native/cocos/platform/android/CCFileUtils-android.cpp index 1d19ac8ab9..c571454648 100644 --- a/native/cocos/platform/android/CCFileUtils-android.cpp +++ b/native/cocos/platform/android/CCFileUtils-android.cpp @@ -314,7 +314,7 @@ std::string FileUtilsAndroid::getWritablePath() const // Fix for Nexus 10 (Android 4.2 multi-user environment) // the path is retrieved through Java Context.getCacheDir() method std::string dir(""); - std::string tmp = JniHelper::callStaticStringMethod(JCLS_HELPER, "getCocos2dxWritablePath"); + std::string tmp = JniHelper::callStaticStringMethod(JCLS_HELPER, "getWritablePath"); if (tmp.length() > 0) { diff --git a/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java b/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java index 289d6c47b6..fa694bc772 100644 --- a/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java +++ b/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java @@ -216,7 +216,7 @@ public class Cocos2dxHelper { int versionCode = 1; try { - versionCode = Cocos2dxActivity.getContext().getPackageManager().getPackageInfo(Cocos2dxHelper.getCocos2dxPackageName(), 0).versionCode; + versionCode = Cocos2dxActivity.getContext().getPackageManager().getPackageInfo(Cocos2dxHelper.getPackageName(), 0).versionCode; } catch (NameNotFoundException e) { e.printStackTrace(); } @@ -291,10 +291,10 @@ public class Cocos2dxHelper { private static native void nativeSetAudioDeviceInfo(boolean isSupportLowLatency, int deviceSampleRate, int audioBufferSizeInFames); - public static String getCocos2dxPackageName() { + public static String getPackageName() { return Cocos2dxHelper.sPackageName; } - public static String getCocos2dxWritablePath() { + public static String getWritablePath() { return Cocos2dxHelper.sFileDirectory; } diff --git a/native/cocos/platform/android/jni/JniImp.cpp b/native/cocos/platform/android/jni/JniImp.cpp index 156a4c4af1..6139352396 100644 --- a/native/cocos/platform/android/jni/JniImp.cpp +++ b/native/cocos/platform/android/jni/JniImp.cpp @@ -509,7 +509,7 @@ std::string getApkPathJNI() std::string getPackageNameJNI() { - return JniHelper::callStaticStringMethod(JCLS_HELPER, "getCocos2dxPackageName"); + return JniHelper::callStaticStringMethod(JCLS_HELPER, "getPackageName"); } int getObbAssetFileDescriptorJNI(const std::string& path, long* startOffset, long* size)