diff --git a/Sample/Android/app/src/main/assets/todo.lua b/Sample/Android/app/src/main/assets/todo.lua index 28807a73..5385fcbf 100644 --- a/Sample/Android/app/src/main/assets/todo.lua +++ b/Sample/Android/app/src/main/assets/todo.lua @@ -14,4 +14,15 @@ function makeList() end return list; +end + +function getFunc() + + return function (a, b) + + print("------", a, b); + return a * b; + + end + end \ No newline at end of file diff --git a/Sample/Android/app/src/main/java/cn/vimfung/luascriptcore/sample/MainActivity.java b/Sample/Android/app/src/main/java/cn/vimfung/luascriptcore/sample/MainActivity.java index 5322e81a..2ad772c4 100644 --- a/Sample/Android/app/src/main/java/cn/vimfung/luascriptcore/sample/MainActivity.java +++ b/Sample/Android/app/src/main/java/cn/vimfung/luascriptcore/sample/MainActivity.java @@ -117,6 +117,10 @@ public void onClick(View v) { LuaValue retValue = _luaContext.callMethod("add", new LuaValue[]{new LuaValue(100), new LuaValue(924)}); Log.v("luaScriptCore",String.format("%d", retValue.toInteger())); + LuaValue funcValue = _luaContext.callMethod("getFunc", null); + retValue = funcValue.toFunction().invoke(new LuaValue[]{new LuaValue(100), new LuaValue(924)}); + Log.v("luaScriptCore",String.format("%d", retValue.toInteger())); + } }); } diff --git a/Sample/Android/app/src/main/jniLibs/arm64-v8a/libLuaScriptCore.so.REMOVED.git-id b/Sample/Android/app/src/main/jniLibs/arm64-v8a/libLuaScriptCore.so.REMOVED.git-id index 2734265f..851e22c4 100644 --- a/Sample/Android/app/src/main/jniLibs/arm64-v8a/libLuaScriptCore.so.REMOVED.git-id +++ b/Sample/Android/app/src/main/jniLibs/arm64-v8a/libLuaScriptCore.so.REMOVED.git-id @@ -1 +1 @@ -52d7c7f06a995db51d0251a179fc160b2738ded3 \ No newline at end of file +62e6392b6dd179bbe243d4944d14cf6f45a43f0e \ No newline at end of file diff --git a/Sample/Android/app/src/main/jniLibs/armeabi-v7a/libLuaScriptCore.so.REMOVED.git-id b/Sample/Android/app/src/main/jniLibs/armeabi-v7a/libLuaScriptCore.so.REMOVED.git-id index 5f251c51..9805de4f 100644 --- a/Sample/Android/app/src/main/jniLibs/armeabi-v7a/libLuaScriptCore.so.REMOVED.git-id +++ b/Sample/Android/app/src/main/jniLibs/armeabi-v7a/libLuaScriptCore.so.REMOVED.git-id @@ -1 +1 @@ -a488904f2a4b7c6e2bb931e689a08c76ab3ec924 \ No newline at end of file +13cf23270c9f79a31ba0ae11b29db4f366a701ba \ No newline at end of file diff --git a/Sample/Android/app/src/main/jniLibs/armeabi/libLuaScriptCore.so.REMOVED.git-id b/Sample/Android/app/src/main/jniLibs/armeabi/libLuaScriptCore.so.REMOVED.git-id index dc4aabca..7fed2104 100644 --- a/Sample/Android/app/src/main/jniLibs/armeabi/libLuaScriptCore.so.REMOVED.git-id +++ b/Sample/Android/app/src/main/jniLibs/armeabi/libLuaScriptCore.so.REMOVED.git-id @@ -1 +1 @@ -98c399db662ce7d6a9acb8865181240a57861202 \ No newline at end of file +799fe41703f55c771bf70c6a61edd024f4fa30ef \ No newline at end of file diff --git a/Sample/Android/app/src/main/jniLibs/mips/libLuaScriptCore.so.REMOVED.git-id b/Sample/Android/app/src/main/jniLibs/mips/libLuaScriptCore.so.REMOVED.git-id index 9e09575e..93a95901 100644 --- a/Sample/Android/app/src/main/jniLibs/mips/libLuaScriptCore.so.REMOVED.git-id +++ b/Sample/Android/app/src/main/jniLibs/mips/libLuaScriptCore.so.REMOVED.git-id @@ -1 +1 @@ -79d905b48d9d5dfcb31caae507cdf890bd011fb3 \ No newline at end of file +3e6dc764293dfbabf0d9962a7eb913b73a079434 \ No newline at end of file diff --git a/Sample/Android/app/src/main/jniLibs/mips64/libLuaScriptCore.so.REMOVED.git-id b/Sample/Android/app/src/main/jniLibs/mips64/libLuaScriptCore.so.REMOVED.git-id index 2951ee36..cb051d63 100644 --- a/Sample/Android/app/src/main/jniLibs/mips64/libLuaScriptCore.so.REMOVED.git-id +++ b/Sample/Android/app/src/main/jniLibs/mips64/libLuaScriptCore.so.REMOVED.git-id @@ -1 +1 @@ -c1eb7434282ac916adec3fec5765b3eea09e2be1 \ No newline at end of file +2d30e2a9aa321f2c80e45197b97c817952276416 \ No newline at end of file diff --git a/Sample/Android/app/src/main/jniLibs/x86/libLuaScriptCore.so.REMOVED.git-id b/Sample/Android/app/src/main/jniLibs/x86/libLuaScriptCore.so.REMOVED.git-id index c15f46ed..eff44d25 100644 --- a/Sample/Android/app/src/main/jniLibs/x86/libLuaScriptCore.so.REMOVED.git-id +++ b/Sample/Android/app/src/main/jniLibs/x86/libLuaScriptCore.so.REMOVED.git-id @@ -1 +1 @@ -7f40c64a7fd42ecd226934d2dbadf90bb9b717cf \ No newline at end of file +2f652b32ea361fc8b8c9409e5b1692968a53af63 \ No newline at end of file diff --git a/Sample/Android/app/src/main/jniLibs/x86_64/libLuaScriptCore.so.REMOVED.git-id b/Sample/Android/app/src/main/jniLibs/x86_64/libLuaScriptCore.so.REMOVED.git-id index 5e875d4d..1b22d106 100644 --- a/Sample/Android/app/src/main/jniLibs/x86_64/libLuaScriptCore.so.REMOVED.git-id +++ b/Sample/Android/app/src/main/jniLibs/x86_64/libLuaScriptCore.so.REMOVED.git-id @@ -1 +1 @@ -25f49f630a7d061f77aa3d2e5df909be95664bbe \ No newline at end of file +e3f06b5416072de4469e0cfe3803e90a5fcd5d86 \ No newline at end of file diff --git a/Source/Android/luascriptcore/src/main/jni/LuaJavaConverter.cpp b/Source/Android/luascriptcore/src/main/jni/LuaJavaConverter.cpp index e2e15d67..fa2ae570 100644 --- a/Source/Android/luascriptcore/src/main/jni/LuaJavaConverter.cpp +++ b/Source/Android/luascriptcore/src/main/jni/LuaJavaConverter.cpp @@ -558,7 +558,7 @@ jobject LuaJavaConverter::convertToJavaObjectByLuaValue(JNIEnv *env, LuaContext //填充数据 for (int i = 0; i < tuple->count(); ++i) { - LuaValue *retValue = tuple -> getResturValueByIndex(i); + LuaValue *retValue = tuple -> getReturnValueByIndex(i); jobject jRetValue = LuaJavaConverter::convertToJavaObjectByLuaValue(env, context, retValue); if (jRetValue != NULL) {