From 144c49a6d76e853eba97af3fd2619ab9e7e13128 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Mon, 10 Jul 2017 18:30:33 +0800 Subject: [PATCH 1/2] Fix js oc reflection issue --- .../js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/native/cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm b/native/cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm index 75beecdad8..722b6d0e2f 100644 --- a/native/cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm +++ b/native/cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm @@ -43,12 +43,16 @@ JS::Value JavaScriptObjCBridge::convertReturnValue(JSContext *cx, ReturnValue re { case TypeInteger: ret = JS::Int32Value(retValue.intValue); + break; case TypeFloat: ret = JS::DoubleValue((double)retValue.floatValue); + break; case TypeBoolean: ret = JS::BooleanValue(retValue.boolValue); + break; case TypeString: c_string_to_jsval(cx, retValue.stringValue->c_str(), &ret, retValue.stringValue->size()); + break; default: break; } From d32214f0d2e1058a8e59bfcbfcade8b2f3aaac04 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Mon, 10 Jul 2017 18:30:55 +0800 Subject: [PATCH 2/2] Fix simulator crash during app close --- native/cocos/scripting/js-bindings/manual/ScriptingCore.cpp | 5 +++++ .../cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp | 2 ++ 2 files changed, 7 insertions(+) diff --git a/native/cocos/scripting/js-bindings/manual/ScriptingCore.cpp b/native/cocos/scripting/js-bindings/manual/ScriptingCore.cpp index 8b89868181..84f391e5f7 100644 --- a/native/cocos/scripting/js-bindings/manual/ScriptingCore.cpp +++ b/native/cocos/scripting/js-bindings/manual/ScriptingCore.cpp @@ -1914,7 +1914,12 @@ bool jsb_remove_proxy(js_proxy_t* proxy) bool jsb_unbind_proxy(js_proxy_t* proxy) { void* nativeKey = proxy->ptr; +#if COCOS2D_DEBUG > 1 CC_ASSERT(nativeKey && "Invalid nativeKey"); +#else + if (!nativeKey) + return false; +#endif // COCOS2D_DEBUG // delete entry in native proxy map auto it_nat = _native_js_global_map.find(nativeKey); diff --git a/native/cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp b/native/cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp index 0f71ec64b5..8bf00d3360 100644 --- a/native/cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp +++ b/native/cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp @@ -76,7 +76,9 @@ namespace jsb } ~Object() { +#if COCOS2D_DEBUG > 1 CCLOG("Release JSBObject %p, with proxy: %p", this, _proxy); +#endif // COCOS2D_DEBUG if (_proxy) { jsb_remove_proxy(_proxy);