diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt index 922acf6f45..e0f9c3c72b 100644 --- a/native/CMakeLists.txt +++ b/native/CMakeLists.txt @@ -1588,8 +1588,10 @@ elseif(OHOS) elseif(APPLE) cocos_source_files( cocos/bindings/manual/jsb_platfrom_apple.mm - cocos/bindings/manual/JavaScriptObjCBridge.h - cocos/bindings/manual/JavaScriptObjCBridge.mm + cocos/bindings/manual/JavaScriptObjCBridge.h + cocos/bindings/manual/JavaScriptObjCBridge.mm + cocos/platform/apple/JsbBridge.h + cocos/platform/apple/JsbBridge.mm ) elseif(WIN32) cocos_source_files( diff --git a/native/cocos/bindings/manual/JavaScriptJavaBridge.cpp b/native/cocos/bindings/manual/JavaScriptJavaBridge.cpp index e0595135eb..40bde75041 100644 --- a/native/cocos/bindings/manual/JavaScriptJavaBridge.cpp +++ b/native/cocos/bindings/manual/JavaScriptJavaBridge.cpp @@ -1,6 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2021 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2018-2021 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -26,17 +25,16 @@ #include "cocos/bindings/manual/JavaScriptJavaBridge.h" #include "cocos/base/UTF8.h" -#include "cocos/bindings/jswrapper/SeApi.h" #include "cocos/bindings/manual/jsb_conversions.h" -#include "platform/java/jni/JniHelper.h" +#include + #if CC_PLATFORM == CC_PLATFORM_ANDROID #include + #elif CC_PLATFORM == CC_PLATFORM_OHOS #include #endif -#include -#include #ifdef LOG_TAG #undef LOG_TAG @@ -48,28 +46,6 @@ #define ORG_JAVABRIDGE_CLASS_NAME com_cocos_lib_CocosJavascriptJavaBridge #endif #define JNI_JSJAVABRIDGE(FUNC) JNI_METHOD1(ORG_JAVABRIDGE_CLASS_NAME, FUNC) - -extern "C" { - -JNIEXPORT jint JNICALL JNI_JSJAVABRIDGE(evalString)(JNIEnv *env, jclass /*cls*/, jstring value) { - if (!se::ScriptEngine::getInstance()->isValid()) { - CC_LOG_DEBUG("ScriptEngine has not been initialized"); - return 0; - } - - se::AutoHandleScope hs; - bool strFlag = false; - std::string strValue = cc::StringUtils::getStringUTFCharsJNI(env, value, &strFlag); - if (!strFlag) { - CC_LOG_DEBUG("JavaScriptJavaBridge_evalString error, invalid string code"); - return 0; - } - se::ScriptEngine::getInstance()->evalString(strValue.c_str()); - return 1; -} - -} // extern "C" - #define JSJ_ERR_OK (0) #define JSJ_ERR_TYPE_NOT_SUPPORT (-1) #define JSJ_ERR_INVALID_SIGNATURES (-2) @@ -106,17 +82,10 @@ public: class CallInfo { public: CallInfo(const char *className, const char *methodName, const char *methodSig) - : _mValid(false), - _mError(JSJ_ERR_OK), - _mClassName(className), - _mMethodName(methodName), - _mMethodSig(methodSig), - _mReturnType(ValueType::VOID), - _mArgumentsCount(0), - _mRetjstring(nullptr), - _mEnv(nullptr), - _mClassID(nullptr), - _mMethodID(nullptr) { + : _mClassName(className), + _mMethodName(methodName), + _mMethodSig(methodSig) + { memset(&_mRet, 0, sizeof(_mRet)); _mValid = validateMethodSig() && getMethodInfo(); } @@ -158,7 +127,7 @@ public: } } - JNIEnv *getEnv() { + JNIEnv *getEnv() const{ return _mEnv; } @@ -182,22 +151,22 @@ public: bool executeWithArgs(jvalue *args); private: - bool _mValid; - int _mError; + bool _mValid{false}; + int _mError{JSJ_ERR_OK}; std::string _mClassName; std::string _mMethodName; std::string _mMethodSig; - int _mArgumentsCount; + int _mArgumentsCount{0}; ValueTypes _mArgumentsType; - ValueType _mReturnType; + ValueType _mReturnType{ValueType::VOID}; ReturnValue _mRet; - jstring _mRetjstring; + jstring _mRetjstring{nullptr}; - JNIEnv * _mEnv; - jclass _mClassID; - jmethodID _mMethodID; + JNIEnv * _mEnv{nullptr}; + jclass _mClassID{nullptr}; + jmethodID _mMethodID{nullptr}; bool validateMethodSig(); bool getMethodInfo(); @@ -205,7 +174,50 @@ public: }; static bool convertReturnValue(ReturnValue retValue, ValueType type, se::Value *ret); + }; +using JsCallback = std::function; +class ScriptNativeBridge{ +public: + void callByNative(const std::string& arg0, const std::string& arg1); + inline void setCallback(const JsCallback& cb){ + _callback = cb; + } + static ScriptNativeBridge* bridgeCxxInstance; + se::Value jsCb; +private: + JsCallback _callback{nullptr}; // NOLINT(readability-identifier-naming) +}; +extern "C" { + +JNIEXPORT jint JNICALL JNI_JSJAVABRIDGE(evalString)(JNIEnv *env, jclass /*cls*/, jstring value) { + if (!se::ScriptEngine::getInstance()->isValid()) { + CC_LOG_DEBUG("ScriptEngine has not been initialized"); + return 0; + } + + se::AutoHandleScope hs; + bool strFlag = false; + std::string strValue = cc::StringUtils::getStringUTFCharsJNI(env, value, &strFlag); + if (!strFlag) { + CC_LOG_DEBUG("JavaScriptJavaBridge_evalString error, invalid string code"); + return 0; + } + se::ScriptEngine::getInstance()->evalString(strValue.c_str()); + return 1; +} +JNIEXPORT void JNICALL +Java_com_cocos_lib_JsbBridge_nativeSendToScript(JNIEnv *env, jclass clazz, jstring arg0, jstring arg1) { // NOLINT + std::string cArg0{cc::JniHelper::jstring2string(arg0)}; + std::string cArg1{cc::JniHelper::jstring2string(arg1)}; + + cc::Application::getInstance()->getScheduler()->performFunctionInCocosThread([=]() { + ScriptNativeBridge::bridgeCxxInstance->callByNative(cArg0, cArg1); + }); +} +} // extern "C" + +ScriptNativeBridge* ScriptNativeBridge::bridgeCxxInstance{nullptr}; JavaScriptJavaBridge::CallInfo::~CallInfo() { if (_mReturnType == ValueType::STRING && _mRet.stringValue) { @@ -601,6 +613,64 @@ static bool JavaScriptJavaBridge_callStaticMethod(se::State &s) { //NOLINT(reada } SE_BIND_FUNC(JavaScriptJavaBridge_callStaticMethod) + +static bool ScriptNativeBridge_getCallback(se::State &s){ //NOLINT(readability-identifier-naming) + auto *cobj = static_cast(s.nativeThisObject()); + assert(cobj == ScriptNativeBridge::bridgeCxxInstance); + s.rval() = cobj->jsCb; + SE_HOLD_RETURN_VALUE(cobj->jsCb, s.thisObject(), s.rval()); + return true; +} +SE_BIND_PROP_GET(ScriptNativeBridge_getCallback) + +static bool ScriptNativeBridge_setCallback(se::State &s){ //NOLINT(readability-identifier-naming) + auto *cobj = static_cast(s.nativeThisObject()); + assert(cobj == ScriptNativeBridge::bridgeCxxInstance); + const auto &args = s.args(); + se::Value jsFunc = args[0]; + cobj->jsCb = jsFunc; + if(jsFunc.isNullOrUndefined()) + { + cobj->setCallback(nullptr); + } + else{ + assert(jsFunc.isObject() && jsFunc.toObject()->isFunction()); + s.thisObject()->attachObject(jsFunc.toObject()); + cobj->setCallback([jsFunc](const std::string& arg0, const std::string& arg1){ + se::AutoHandleScope hs; + se::ValueArray args; + args.push_back(se::Value(arg0)); + if(!arg1.empty()) { + args.push_back(se::Value(arg1)); + } + jsFunc.toObject()->call(args, nullptr); + }); + } + return true; +}SE_BIND_PROP_SET(ScriptNativeBridge_setCallback) + +static bool ScriptNativeBridge_sendToNative(se::State &s) { //NOLINT(readability-identifier-naming) + const auto &args = s.args(); + size_t argc = args.size(); + if (argc >= 1 && argc < 3) { + bool ok = false; + std::string arg0; + ok = seval_to_std_string(args[0], &arg0); + SE_PRECONDITION2(ok, false, "Converting arg0 failed!"); + std::string arg1; + if (argc == 2) { + ok = seval_to_std_string(args[1], &arg1); + SE_PRECONDITION2(ok, false, "Converting arg1 failed!"); + } + callPlatformStringMethod(arg0, arg1); + SE_PRECONDITION2(ok, false, "call java method failed!"); + return ok; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting at least %d and less than %d", static_cast(argc), 1, 3); + return false; +} +SE_BIND_FUNC(ScriptNativeBridge_sendToNative) + bool register_javascript_java_bridge(se::Object *obj) { //NOLINT(readability-identifier-naming) se::Class *cls = se::Class::create("JavascriptJavaBridge", obj, nullptr, _SE(JavaScriptJavaBridge_constructor)); cls->defineFinalizeFunction(_SE(JavaScriptJavaBridge_finalize)); @@ -614,3 +684,45 @@ bool register_javascript_java_bridge(se::Object *obj) { //NOLINT(readability-ide return true; } + +se::Class *__jsb_ScriptNativeBridge_class = nullptr; // NOLINT + +static bool ScriptNativeBridge_finalize(se::State &s) { //NOLINT(readability-identifier-naming) + auto *cobj = static_cast(s.nativeThisObject()); + assert(cobj == ScriptNativeBridge::bridgeCxxInstance); + delete cobj; + ScriptNativeBridge::bridgeCxxInstance = nullptr; + return true; +} +SE_BIND_FINALIZE_FUNC(ScriptNativeBridge_finalize) + +static bool ScriptNativeBridge_constructor(se::State &s) { //NOLINT(readability-identifier-naming) + auto *cobj = new (std::nothrow) ScriptNativeBridge(); + s.thisObject()->setPrivateData(cobj); + ScriptNativeBridge::bridgeCxxInstance = cobj; + return true; +} +SE_BIND_CTOR(ScriptNativeBridge_constructor, __jsb_ScriptNativeBridge_class, ScriptNativeBridge_finalize) +bool register_script_native_bridge(se::Object *obj) { //NOLINT(readability-identifier-naming) + se::Class *cls = se::Class::create("ScriptNativeBridge", obj, nullptr, _SE(ScriptNativeBridge_constructor)); + cls->defineFinalizeFunction(_SE(ScriptNativeBridge_finalize)); + cls->defineFunction("sendToNative", _SE(ScriptNativeBridge_sendToNative)); + cls->defineProperty("onNative", _SE(ScriptNativeBridge_getCallback), _SE(ScriptNativeBridge_setCallback)); + + cls->install(); + __jsb_ScriptNativeBridge_class = cls; + + se::ScriptEngine::getInstance()->clearException(); + + return true; +} +void callPlatformStringMethod(const std::string &arg0, const std::string &arg1) { + cc::JniHelper::callStaticVoidMethod( + "com/cocos/lib/JsbBridge", "callByScript", arg0, arg1); +} + +void ScriptNativeBridge::callByNative(const std::string& arg0, const std::string& arg1){ + _callback(arg0, arg1); +} + + diff --git a/native/cocos/bindings/manual/JavaScriptJavaBridge.h b/native/cocos/bindings/manual/JavaScriptJavaBridge.h index 3cacc10466..2066994d43 100644 --- a/native/cocos/bindings/manual/JavaScriptJavaBridge.h +++ b/native/cocos/bindings/manual/JavaScriptJavaBridge.h @@ -1,6 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2021 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2018-2021 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -25,9 +24,15 @@ ****************************************************************************/ #pragma once - +#include +#include +#include "platform/java/jni/JniHelper.h" +#include "cocos/bindings/jswrapper/SeApi.h" namespace se { class Object; } -bool register_javascript_java_bridge(se::Object *obj); + +bool register_javascript_java_bridge(se::Object *obj); // NOLINT(readability-identifier-naming) +bool register_script_native_bridge(se::Object *obj); // NOLINT(readability-identifier-naming) +void callPlatformStringMethod(const std::string &arg0, const std::string &arg1); // NOLINT(readability-identifier-naming) diff --git a/native/cocos/bindings/manual/JavaScriptObjCBridge.h b/native/cocos/bindings/manual/JavaScriptObjCBridge.h index 2edbf64be0..e970476579 100644 --- a/native/cocos/bindings/manual/JavaScriptObjCBridge.h +++ b/native/cocos/bindings/manual/JavaScriptObjCBridge.h @@ -1,6 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2021 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2018-2021 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -25,9 +24,13 @@ ****************************************************************************/ #pragma once - +#include "cocos/bindings/jswrapper/SeApi.h" +#include namespace se { class Object; } bool register_javascript_objc_bridge(se::Object *obj); +bool register_script_native_bridge(se::Object *obj); // NOLINT(readability-identifier-naming) +bool callPlatformStringMethod(const std::string &arg0, const std::string &arg1); +void callScript(const std::string &arg0, const std::string& arg1); diff --git a/native/cocos/bindings/manual/JavaScriptObjCBridge.mm b/native/cocos/bindings/manual/JavaScriptObjCBridge.mm index df0622ea8c..84f50aa0d0 100644 --- a/native/cocos/bindings/manual/JavaScriptObjCBridge.mm +++ b/native/cocos/bindings/manual/JavaScriptObjCBridge.mm @@ -1,6 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2021 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2018-2021 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -27,13 +26,41 @@ #include "JavaScriptObjCBridge.h" #include "cocos/bindings/manual/jsb_conversions.h" #include "cocos/bindings/manual/jsb_global.h" -#include "cocos/bindings/jswrapper/SeApi.h" + #include #include +#include #import +se::Value static objc_to_seval(id objcVal) { + se::Value ret; + if (objcVal == nil) + return ret; + + if ([objcVal isKindOfClass:[NSNumber class]]) { + NSNumber *number = (NSNumber *)objcVal; + std::string numberType = [number objCType]; + if (numberType == @encode(BOOL) || numberType == @encode(bool)) { + ret.setBoolean([number boolValue]); + } else if (numberType == @encode(int) || numberType == @encode(long) || numberType == @encode(short) || numberType == @encode(unsigned int) || numberType == @encode(unsigned long) || numberType == @encode(unsigned short) || numberType == @encode(float) || numberType == @encode(double) || numberType == @encode(char) || numberType == @encode(unsigned char)) { + ret.setDouble([number doubleValue]); + } else { + CC_LOG_ERROR("Unknown number type: %s", numberType.c_str()); + } + } else if ([objcVal isKindOfClass:[NSString class]]) { + const char *content = [objcVal cStringUsingEncoding:NSUTF8StringEncoding]; + ret.setString(content); + } else if ([objcVal isKindOfClass:[NSDictionary class]]) { + CC_LOG_ERROR("JavaScriptObjCBridge doesn't support to bind NSDictionary!"); + } else { + const char *content = [[NSString stringWithFormat:@"%@", objcVal] cStringUsingEncoding:NSUTF8StringEncoding]; + ret.setString(content); + } + + return ret; +} #define JSO_ERR_OK (0) #define JSO_ERR_TYPE_NOT_SUPPORT (-1) #define JSO_ERR_INVALID_ARGUMENTS (-2) @@ -47,8 +74,8 @@ public: class CallInfo { public: CallInfo(const char *className, const char *methodName) - : _className(className), - _methodName(methodName) {} + : _className(className), + _methodName(methodName) {} ~CallInfo() {} @@ -57,16 +84,27 @@ public: } bool execute(const se::ValueArray &argv, se::Value &rval); - private: - se::Value objc_to_seval(id objcVal); - - int _error = JSO_ERR_OK; + int _error{JSO_ERR_OK}; std::string _className; std::string _methodName; }; }; +using JsCallback = std::function; + +class ScriptNativeBridge{ +public: + void callByNative(const std::string& arg0, const std::string& arg1); + inline void setCallback(const JsCallback& cb){ + _callback = cb; + } + static ScriptNativeBridge* bridgeCxxInstance; + se::Value jsCb; +private: + JsCallback _callback{nullptr}; // NOLINT(readability-identifier-naming) +}; +ScriptNativeBridge* ScriptNativeBridge::bridgeCxxInstance{nullptr}; bool JavaScriptObjCBridge::CallInfo::execute(const se::ValueArray &argv, se::Value &rval) { NSString *className = [NSString stringWithCString:_className.c_str() encoding:NSUTF8StringEncoding]; NSString *methodName = [NSString stringWithCString:_methodName.c_str() encoding:NSUTF8StringEncoding]; @@ -249,32 +287,9 @@ bool JavaScriptObjCBridge::CallInfo::execute(const se::ValueArray &argv, se::Val return true; } -se::Value JavaScriptObjCBridge::CallInfo::objc_to_seval(id objcVal) { - se::Value ret; - if (objcVal == nil) - return ret; - if ([objcVal isKindOfClass:[NSNumber class]]) { - NSNumber *number = (NSNumber *)objcVal; - std::string numberType = [number objCType]; - if (numberType == @encode(BOOL) || numberType == @encode(bool)) { - ret.setBoolean([number boolValue]); - } else if (numberType == @encode(int) || numberType == @encode(long) || numberType == @encode(short) || numberType == @encode(unsigned int) || numberType == @encode(unsigned long) || numberType == @encode(unsigned short) || numberType == @encode(float) || numberType == @encode(double) || numberType == @encode(char) || numberType == @encode(unsigned char)) { - ret.setDouble([number doubleValue]); - } else { - CC_LOG_ERROR("Unknown number type: %s", numberType.c_str()); - } - } else if ([objcVal isKindOfClass:[NSString class]]) { - const char *content = [objcVal cStringUsingEncoding:NSUTF8StringEncoding]; - ret.setString(content); - } else if ([objcVal isKindOfClass:[NSDictionary class]]) { - CC_LOG_ERROR("JavaScriptObjCBridge doesn't support to bind NSDictionary!"); - } else { - const char *content = [[NSString stringWithFormat:@"%@", objcVal] cStringUsingEncoding:NSUTF8StringEncoding]; - ret.setString(content); - } - - return ret; +void ScriptNativeBridge::callByNative(const std::string& arg0, const std::string& arg1){ + _callback(arg0, arg1); } se::Class *__jsb_JavaScriptObjCBridge_class = nullptr; @@ -321,12 +336,69 @@ static bool JavaScriptObjCBridge_callStaticMethod(se::State &s) { } SE_BIND_FUNC(JavaScriptObjCBridge_callStaticMethod) +static bool ScriptNativeBridge_getCallback(se::State &s){ + ScriptNativeBridge *cobj = (ScriptNativeBridge *)s.nativeThisObject(); + assert(cobj == ScriptNativeBridge::bridgeCxxInstance); + s.rval() = cobj->jsCb; + SE_HOLD_RETURN_VALUE(cobj->jsCb, s.thisObject(), s.rval()); + return true; +} +SE_BIND_PROP_GET(ScriptNativeBridge_getCallback) + +static bool ScriptNativeBridge_setCallback(se::State &s){ //NOLINT(readability-identifier-naming) + auto *cobj = static_cast(s.nativeThisObject()); + assert(cobj == ScriptNativeBridge::bridgeCxxInstance); + const auto &args = s.args(); + se::Value jsFunc = args[0]; + cobj->jsCb = jsFunc; + if(jsFunc.isNullOrUndefined()) + { + cobj->setCallback(nullptr); + } + else{ + assert(jsFunc.isObject() && jsFunc.toObject()->isFunction()); + s.thisObject()->attachObject(jsFunc.toObject()); + cobj->setCallback([jsFunc](const std::string& arg0, const std::string& arg1){ + se::AutoHandleScope hs; + se::ValueArray args; + args.push_back(se::Value(arg0)); + if(!arg1.empty()) { + args.push_back(se::Value(arg1)); + } + jsFunc.toObject()->call(args, nullptr); + }); + } + return true; +}SE_BIND_PROP_SET(ScriptNativeBridge_setCallback) + +static bool ScriptNativeBridge_sendToNative(se::State &s) { //NOLINT + const auto &args = s.args(); + int argc = (int)args.size(); + if (argc >= 1 && argc < 3) { + bool ok = false; + std::string arg0; + ok = seval_to_std_string(args[0], &arg0); + SE_PRECONDITION2(ok, false, "Converting first argument failed!"); + std::string arg1; + if (argc == 2) { + ok = seval_to_std_string(args[1], &arg1); + SE_PRECONDITION2(ok, false, "Converting second argument failed!"); + } + ok = callPlatformStringMethod(arg0, arg1); + SE_PRECONDITION2(ok, false, "call platform event failed!"); + return ok; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting at least %d and less than %d", argc, 1, 3); + return false; +} +SE_BIND_FUNC(ScriptNativeBridge_sendToNative) + + bool register_javascript_objc_bridge(se::Object *obj) { se::Class *cls = se::Class::create("JavaScriptObjCBridge", obj, nullptr, _SE(JavaScriptObjCBridge_constructor)); cls->defineFinalizeFunction(_SE(JavaScriptObjCBridge_finalize)); cls->defineFunction("callStaticMethod", _SE(JavaScriptObjCBridge_callStaticMethod)); - cls->install(); __jsb_JavaScriptObjCBridge_class = cls; @@ -334,3 +406,40 @@ bool register_javascript_objc_bridge(se::Object *obj) { return true; } + + + +se::Class *__jsb_ScriptNativeBridge_class = nullptr; // NOLINT + +static bool ScriptNativeBridge_finalize(se::State &s) { //NOLINT(readability-identifier-naming) + auto *cobj = static_cast(s.nativeThisObject()); + assert(cobj == ScriptNativeBridge::bridgeCxxInstance); + delete cobj; + ScriptNativeBridge::bridgeCxxInstance = nullptr; + return true; +} +SE_BIND_FINALIZE_FUNC(ScriptNativeBridge_finalize) + +static bool ScriptNativeBridge_constructor(se::State &s) { //NOLINT(readability-identifier-naming) + auto *cobj = new (std::nothrow) ScriptNativeBridge(); + s.thisObject()->setPrivateData(cobj); + ScriptNativeBridge::bridgeCxxInstance = cobj; + return true; +} +SE_BIND_CTOR(ScriptNativeBridge_constructor, __jsb_ScriptNativeBridge_class, ScriptNativeBridge_finalize) +bool register_script_native_bridge(se::Object *obj) { //NOLINT(readability-identifier-naming) + se::Class *cls = se::Class::create("ScriptNativeBridge", obj, nullptr, _SE(ScriptNativeBridge_constructor)); + cls->defineFinalizeFunction(_SE(ScriptNativeBridge_finalize)); + cls->defineFunction("sendToNative", _SE(ScriptNativeBridge_sendToNative)); + cls->defineProperty("onNative", _SE(ScriptNativeBridge_getCallback), _SE(ScriptNativeBridge_setCallback)); + + cls->install(); + __jsb_ScriptNativeBridge_class = cls; + + se::ScriptEngine::getInstance()->clearException(); + + return true; +} +void callScript(const std::string& arg0, const std::string& arg1){ + ScriptNativeBridge::bridgeCxxInstance->callByNative(arg0, arg1); +} diff --git a/native/cocos/bindings/manual/jsb_global.cpp b/native/cocos/bindings/manual/jsb_global.cpp index fbc62d037a..99caa36576 100644 --- a/native/cocos/bindings/manual/jsb_global.cpp +++ b/native/cocos/bindings/manual/jsb_global.cpp @@ -40,7 +40,6 @@ #if CC_PLATFORM == CC_PLATFORM_ANDROID #include "platform/java/jni/JniImp.h" #endif - #include #include #include diff --git a/native/cocos/bindings/manual/jsb_module_register.cpp b/native/cocos/bindings/manual/jsb_module_register.cpp index 7c1d8182d1..e29d1fbca5 100644 --- a/native/cocos/bindings/manual/jsb_module_register.cpp +++ b/native/cocos/bindings/manual/jsb_module_register.cpp @@ -128,10 +128,12 @@ bool jsb_register_all_modules() { #if (CC_PLATFORM == CC_PLATFORM_MAC_IOS || CC_PLATFORM == CC_PLATFORM_MAC_OSX) se->addRegisterCallback(register_javascript_objc_bridge); + se->addRegisterCallback(register_script_native_bridge); #endif #if (CC_PLATFORM == CC_PLATFORM_ANDROID || CC_PLATFORM == CC_PLATFORM_OHOS) se->addRegisterCallback(register_javascript_java_bridge); + se->addRegisterCallback(register_script_native_bridge); #endif #if USE_AUDIO diff --git a/native/cocos/platform/android/java/src/com/cocos/lib/JsbBridge.java b/native/cocos/platform/android/java/src/com/cocos/lib/JsbBridge.java new file mode 100644 index 0000000000..375ae8eaa4 --- /dev/null +++ b/native/cocos/platform/android/java/src/com/cocos/lib/JsbBridge.java @@ -0,0 +1,61 @@ +/**************************************************************************** + Copyright (c) 2018-2021 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ +package com.cocos.lib; + +public class JsbBridge { + public interface ICallback{ + /** + * Applies this callback to the given argument. + * + * @param arg0 as input + * @param arg1 as input + */ + void onScript(String arg0, String arg1); + } + private static ICallback callback; + + private static void callByScript(String arg0, String arg1){ + if(JsbBridge.callback != null) + callback.onScript(arg0, arg1); + } + + /**Add a callback which you would like to apply + * @param f ICallback, the method which will be actually applied. multiple calls will override + * */ + public static void setCallback(ICallback f){ + JsbBridge.callback = f; + } + /** + * Java dispatch Js event, use native c++ code + * @param arg0 input values + */ + private static native void nativeSendToScript(String arg0, String arg1); + public static void sendToScript(String arg0, String arg1){ + nativeSendToScript(arg0, arg1); + } + public static void sendToScript(String arg0){ + nativeSendToScript(arg0, null); + } +} \ No newline at end of file diff --git a/native/cocos/platform/apple/JsbBridge.h b/native/cocos/platform/apple/JsbBridge.h new file mode 100644 index 0000000000..a96919d5e2 --- /dev/null +++ b/native/cocos/platform/apple/JsbBridge.h @@ -0,0 +1,40 @@ +/**************************************************************************** + Copyright (c) 2018-2021 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +****************************************************************************/ + +#pragma once + +#import + +typedef void (^ICallback)(NSString*, NSString*); + + +@interface JsbBridge : NSObject ++(instancetype)sharedInstance; +-(void)setCallback:(ICallback)cb; +-(bool)callByScript:(NSString*)arg0 arg1:(NSString*)arg1; +-(void)sendToScript:(NSString*)arg0 arg1:(NSString*)arg1; +-(void)sendToScript:(NSString*)arg0; +@end + diff --git a/native/cocos/platform/apple/JsbBridge.mm b/native/cocos/platform/apple/JsbBridge.mm new file mode 100644 index 0000000000..702ef0f3b8 --- /dev/null +++ b/native/cocos/platform/apple/JsbBridge.mm @@ -0,0 +1,91 @@ +/**************************************************************************** + Copyright (c) 2018-2021 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +****************************************************************************/ + +#import +#include +#include +#include "JsbBridge.h" +#include "cocos/bindings/manual/JavaScriptObjCBridge.h" + +bool callPlatformStringMethod(const std::string &arg0, const std::string &arg1){ + NSString *oc_arg0 = [NSString stringWithCString:arg0.c_str() encoding:NSUTF8StringEncoding]; + NSString *oc_arg1 = [NSString stringWithCString:arg1.c_str() encoding:NSUTF8StringEncoding]; + JsbBridge * m = [JsbBridge sharedInstance]; + [m callByScript:oc_arg0 arg1:oc_arg1]; + return true; +} + +@implementation JsbBridge { + ICallback callback; +} + +static JsbBridge* instance = nil; + ++(instancetype)sharedInstance{ + static dispatch_once_t pred = 0; + dispatch_once(&pred, ^{ + instance = [[super allocWithZone:NULL]init]; + }); + return instance; +} + ++(id)allocWithZone:(struct _NSZone *)zone{ + return [JsbBridge sharedInstance]; +} + +-(id)copyWithZone:(struct _NSZone *)zone{ + return [JsbBridge sharedInstance]; +} + +-(id)init{ + self = [super init]; + return self; +} + +-(void)setCallback:(ICallback)cb{ + callback = cb; +} + +-(bool)callByScript:(NSString*)arg0 arg1:(NSString *)arg1{ + if(callback != nil){ + callback(arg0, arg1); + return true; + } + return false; +} + +-(void)sendToScript:(NSString *)arg0 arg1:(NSString *)arg1{ + const std::string c_arg0{[arg0 UTF8String]}; + const std::string c_arg1{[arg1 UTF8String]}; + callScript(c_arg0, c_arg1); +} + +-(void)sendToScript:(NSString *)arg0{ + const std::string c_arg0{[arg0 UTF8String]}; + callScript(c_arg0, ""); +} + +@end + diff --git a/native/cocos/platform/ohos/libcocos/src/main/java/com/cocos/lib/JsbBridge.java b/native/cocos/platform/ohos/libcocos/src/main/java/com/cocos/lib/JsbBridge.java new file mode 100644 index 0000000000..375ae8eaa4 --- /dev/null +++ b/native/cocos/platform/ohos/libcocos/src/main/java/com/cocos/lib/JsbBridge.java @@ -0,0 +1,61 @@ +/**************************************************************************** + Copyright (c) 2018-2021 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ +package com.cocos.lib; + +public class JsbBridge { + public interface ICallback{ + /** + * Applies this callback to the given argument. + * + * @param arg0 as input + * @param arg1 as input + */ + void onScript(String arg0, String arg1); + } + private static ICallback callback; + + private static void callByScript(String arg0, String arg1){ + if(JsbBridge.callback != null) + callback.onScript(arg0, arg1); + } + + /**Add a callback which you would like to apply + * @param f ICallback, the method which will be actually applied. multiple calls will override + * */ + public static void setCallback(ICallback f){ + JsbBridge.callback = f; + } + /** + * Java dispatch Js event, use native c++ code + * @param arg0 input values + */ + private static native void nativeSendToScript(String arg0, String arg1); + public static void sendToScript(String arg0, String arg1){ + nativeSendToScript(arg0, arg1); + } + public static void sendToScript(String arg0){ + nativeSendToScript(arg0, null); + } +} \ No newline at end of file