Merge the code of v3.3.1 platform adaptation layer into the development branch (#3958)

* 1、Merge platform adaptation layer code into the development branch
2、It passed the test in windows and ohos system

* 1、Merge platform adaptation layer code into the development branch
2、It passed the test in windows and ohos system

* 1、Fix github compile windows error

* 1、Fix github compile windows error

* 1. Adjust the code format;
2. Fix js automatic generation binding
3. Adjust github CI compilation

* 1. Adjust the code format;
2. Fix js automatic generation binding
3. Adjust github CI compilation

* Solve mac and ios compilation failure

* Fix the problem of compilation of Windows-side simulator

* 1. Adapt the simulator to a new adaptation layer;
2. Fix the compilation warning of ios, and the implicit conversion failed;
3. Fix the mac compilation error, due to the problem of adding the link identification -all_load;

* 1.Add the isDisplayStats and setDisplayStats method to the screen interface

* Fix clang-tidy compilation warning

* Fix clang-tidy compilation warning

* Repair the emulator, compatible with mac and win

* 1、Repair detailed errors, including name modification and calling method modification
2、Delete redundant files in the template directory
3、Change the vibrate interface to vibrator
4、Fix word spelling errors

* Rename interfaces to modules

* Replace CC_ASSERT with CCASSERT

* Replace CC_ASSERT with CCASSERT

Co-authored-by: qiuguohua <>
This commit is contained in:
qiuguohua
2021-10-27 10:51:02 +08:00
committed by GitHub
parent 606dd0f2f0
commit eeb9d5c689
249 changed files with 12109 additions and 7683 deletions
@@ -26,8 +26,7 @@
#include "cocos/bindings/manual/JavaScriptJavaBridge.h"
#include "cocos/base/UTF8.h"
#include "cocos/bindings/manual/jsb_conversions.h"
#include <cocos/platform/Application.h>
#include "cocos/application/ApplicationManager.h"
#if CC_PLATFORM == CC_PLATFORM_ANDROID
#include <android/log.h>
@@ -211,7 +210,7 @@ Java_com_cocos_lib_JsbBridge_nativeSendToScript(JNIEnv *env, jclass clazz, jstri
std::string cArg0{cc::JniHelper::jstring2string(arg0)};
std::string cArg1{cc::JniHelper::jstring2string(arg1)};
cc::Application::getInstance()->getScheduler()->performFunctionInCocosThread([=]() {
CC_CURRENT_ENGINE()->getScheduler()->performFunctionInCocosThread([=]() {
ScriptNativeBridge::bridgeCxxInstance->callByNative(cArg0, cArg1);
});
}