From 9a430049ad050025c7cbeb290f53745ff6f82934 Mon Sep 17 00:00:00 2001 From: chenxianyin <420373550@qq.com> Date: Fri, 28 Jun 2019 16:43:56 +0800 Subject: [PATCH 1/5] add setOptimise function for c++. --- cocos/platform/CCDataManager.cpp | 5 +++++ cocos/platform/CCDataManager.h | 1 + 2 files changed, 6 insertions(+) diff --git a/cocos/platform/CCDataManager.cpp b/cocos/platform/CCDataManager.cpp index 80a5343a7f11..bd05168d04db 100644 --- a/cocos/platform/CCDataManager.cpp +++ b/cocos/platform/CCDataManager.cpp @@ -64,5 +64,10 @@ void DataManager::onShaderLoaderEnd(){ JniHelper::callStaticVoidMethod(DataManagerClassName, "onShaderLoaderEnd"); #endif } +void DataManager::setOptimise(const char* thing, const char* value){ +#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID + JniHelper::callStaticVoidMethod(DataManagerClassName, "setOptimise", thing, value); +#endif +} NS_CC_END diff --git a/cocos/platform/CCDataManager.h b/cocos/platform/CCDataManager.h index 1e5c3bf18e0c..c3f2b3b74c24 100644 --- a/cocos/platform/CCDataManager.h +++ b/cocos/platform/CCDataManager.h @@ -47,6 +47,7 @@ class CC_DLL DataManager static void onSceneLoaderEnd(); static void onShaderLoaderBegin(); static void onShaderLoaderEnd(); + static void setOptimise(const char* thing, const char* value); }; // end of platform group From 6f915c71a409f6e4f101b22f8e0aea5b715ad0f3 Mon Sep 17 00:00:00 2001 From: chenxianyin <420373550@qq.com> Date: Fri, 28 Jun 2019 16:54:28 +0800 Subject: [PATCH 2/5] add setOptimise function for c++. --- cocos/platform/CCDataManager.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cocos/platform/CCDataManager.cpp b/cocos/platform/CCDataManager.cpp index bd05168d04db..a923633de50b 100644 --- a/cocos/platform/CCDataManager.cpp +++ b/cocos/platform/CCDataManager.cpp @@ -65,6 +65,9 @@ void DataManager::onShaderLoaderEnd(){ #endif } void DataManager::setOptimise(const char* thing, const char* value){ + if (nullptr == thing || nullptr == value){ + return; + } #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID JniHelper::callStaticVoidMethod(DataManagerClassName, "setOptimise", thing, value); #endif From 21c518621b1a8f4d53cbb56b615b3b4265051cc4 Mon Sep 17 00:00:00 2001 From: chenxianyin <420373550@qq.com> Date: Tue, 2 Jul 2019 09:53:34 +0800 Subject: [PATCH 3/5] add setOptimise function for c++. --- cocos/platform/CCDataManager.cpp | 7 ++----- cocos/platform/CCDataManager.h | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cocos/platform/CCDataManager.cpp b/cocos/platform/CCDataManager.cpp index a923633de50b..280bd5b02d3e 100644 --- a/cocos/platform/CCDataManager.cpp +++ b/cocos/platform/CCDataManager.cpp @@ -64,12 +64,9 @@ void DataManager::onShaderLoaderEnd(){ JniHelper::callStaticVoidMethod(DataManagerClassName, "onShaderLoaderEnd"); #endif } -void DataManager::setOptimise(const char* thing, const char* value){ - if (nullptr == thing || nullptr == value){ - return; - } +void DataManager::setOptimise(std::string thing, std::string value){ #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID - JniHelper::callStaticVoidMethod(DataManagerClassName, "setOptimise", thing, value); + JniHelper::callStaticVoidMethod(DataManagerClassName, "setOptimise", thing.c_str(), value.c_str()); #endif } diff --git a/cocos/platform/CCDataManager.h b/cocos/platform/CCDataManager.h index c3f2b3b74c24..7c710af75bfe 100644 --- a/cocos/platform/CCDataManager.h +++ b/cocos/platform/CCDataManager.h @@ -28,6 +28,7 @@ THE SOFTWARE. #ifndef __CC_DataManager_H__ #define __CC_DataManager_H__ +#include #include "platform/CCPlatformMacros.h" #include "base/ccTypes.h" @@ -47,7 +48,7 @@ class CC_DLL DataManager static void onSceneLoaderEnd(); static void onShaderLoaderBegin(); static void onShaderLoaderEnd(); - static void setOptimise(const char* thing, const char* value); + static void setOptimise(std::string thing, std::string value); }; // end of platform group From 1b59dca9b9b57f6ae74b5518ebf70b86bdb10dcc Mon Sep 17 00:00:00 2001 From: chenxianyin <420373550@qq.com> Date: Tue, 2 Jul 2019 14:58:13 +0800 Subject: [PATCH 4/5] add setOptimise function for c++ --- cocos/platform/CCDataManager.cpp | 2 +- cocos/platform/CCDataManager.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/platform/CCDataManager.cpp b/cocos/platform/CCDataManager.cpp index 280bd5b02d3e..3d3cb4fe412e 100644 --- a/cocos/platform/CCDataManager.cpp +++ b/cocos/platform/CCDataManager.cpp @@ -64,7 +64,7 @@ void DataManager::onShaderLoaderEnd(){ JniHelper::callStaticVoidMethod(DataManagerClassName, "onShaderLoaderEnd"); #endif } -void DataManager::setOptimise(std::string thing, std::string value){ +void DataManager::setOptimise(std::string& thing, std::string& value){ #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID JniHelper::callStaticVoidMethod(DataManagerClassName, "setOptimise", thing.c_str(), value.c_str()); #endif diff --git a/cocos/platform/CCDataManager.h b/cocos/platform/CCDataManager.h index 7c710af75bfe..cf77d81ca1ad 100644 --- a/cocos/platform/CCDataManager.h +++ b/cocos/platform/CCDataManager.h @@ -48,7 +48,7 @@ class CC_DLL DataManager static void onSceneLoaderEnd(); static void onShaderLoaderBegin(); static void onShaderLoaderEnd(); - static void setOptimise(std::string thing, std::string value); + static void setOptimise(std::string& thing, std::string& value); }; // end of platform group From 3a2daa7cb9943703e6e5094ae3919b18571bf026 Mon Sep 17 00:00:00 2001 From: chenxianyin <420373550@qq.com> Date: Wed, 3 Jul 2019 09:43:21 +0800 Subject: [PATCH 5/5] add setOptimise function for c++ --- cocos/platform/CCDataManager.cpp | 2 +- cocos/platform/CCDataManager.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/platform/CCDataManager.cpp b/cocos/platform/CCDataManager.cpp index 3d3cb4fe412e..f359487a33cb 100644 --- a/cocos/platform/CCDataManager.cpp +++ b/cocos/platform/CCDataManager.cpp @@ -64,7 +64,7 @@ void DataManager::onShaderLoaderEnd(){ JniHelper::callStaticVoidMethod(DataManagerClassName, "onShaderLoaderEnd"); #endif } -void DataManager::setOptimise(std::string& thing, std::string& value){ +void DataManager::setOptimise(const std::string& thing, const std::string& value){ #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID JniHelper::callStaticVoidMethod(DataManagerClassName, "setOptimise", thing.c_str(), value.c_str()); #endif diff --git a/cocos/platform/CCDataManager.h b/cocos/platform/CCDataManager.h index cf77d81ca1ad..b12389389ca5 100644 --- a/cocos/platform/CCDataManager.h +++ b/cocos/platform/CCDataManager.h @@ -48,7 +48,7 @@ class CC_DLL DataManager static void onSceneLoaderEnd(); static void onShaderLoaderBegin(); static void onShaderLoaderEnd(); - static void setOptimise(std::string& thing, std::string& value); + static void setOptimise(const std::string& thing, const std::string& value); }; // end of platform group