Skip to content

Commit 2779a37

Browse files
vimfungvimfung
committed
修复对象在lua和原生层中相互传递时，部分方法处理行为不一致问题。
1 parent 44fe2d0 commit 2779a37

31 files changed

Lines changed: 424 additions & 215 deletions

‎Sample/Android/app/src/main/jniLibs/arm64-v8a/libLuaScriptCore.so‎

8 KB
Binary file not shown.

‎Sample/Android/app/src/main/jniLibs/armeabi-v7a/libLuaScriptCore.so‎

0 Bytes
Binary file not shown.

‎Sample/Android/app/src/main/jniLibs/armeabi/libLuaScriptCore.so‎

4 KB
Binary file not shown.

‎Sample/Android/app/src/main/jniLibs/mips/libLuaScriptCore.so‎

248 Bytes
Binary file not shown.

‎Sample/Android/app/src/main/jniLibs/mips64/libLuaScriptCore.so‎

4.27 KB
Binary file not shown.

‎Sample/Android/app/src/main/jniLibs/x86/libLuaScriptCore.so‎

0 Bytes
Binary file not shown.

‎Sample/Android/app/src/main/jniLibs/x86_64/libLuaScriptCore.so‎

4 KB
Binary file not shown.

‎Sample/Android/app/src/main/libs/LuaScriptCore.jar‎

33 Bytes
Binary file not shown.

‎Sample/iOS_OSX/Sample.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
7C236D0E1DC87E7900E1F9CF /* libLuaScriptCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C236D0D1DC87E7900E1F9CF /* libLuaScriptCore.a */; };
10+
7C236D291DC8C60F00E1F9CF /* libLuaScriptCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C236D281DC8C60F00E1F9CF /* libLuaScriptCore.a */; };
1111
7C5A61811D6AE2A3007D4308 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C5A61801D6AE2A3007D4308 /* AppDelegate.m */; };
1212
7C5A61841D6AE2A3007D4308 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C5A61831D6AE2A3007D4308 /* main.m */; };
1313
7C5A61871D6AE2A3007D4308 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C5A61861D6AE2A3007D4308 /* ViewController.m */; };
@@ -33,15 +33,15 @@
3333
/* End PBXBuildFile section */
3434

3535
/* Begin PBXFileReference section */
36-
7C236D051DC87E7900E1F9CF /* LSCContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSCContext.h; sourceTree = "<group>"; };
37-
7C236D061DC87E7900E1F9CF /* LSCFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSCFunction.h; sourceTree = "<group>"; };
38-
7C236D071DC87E7900E1F9CF /* LSCModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSCModule.h; sourceTree = "<group>"; };
39-
7C236D081DC87E7900E1F9CF /* LSCObjectClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSCObjectClass.h; sourceTree = "<group>"; };
40-
7C236D091DC87E7900E1F9CF /* LSCPointer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSCPointer.h; sourceTree = "<group>"; };
41-
7C236D0A1DC87E7900E1F9CF /* LSCTypeDefinied.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSCTypeDefinied.h; sourceTree = "<group>"; };
42-
7C236D0B1DC87E7900E1F9CF /* LSCValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSCValue.h; sourceTree = "<group>"; };
43-
7C236D0C1DC87E7900E1F9CF /* LuaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuaScriptCore.h; sourceTree = "<group>"; };
44-
7C236D0D1DC87E7900E1F9CF /* libLuaScriptCore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libLuaScriptCore.a; sourceTree = "<group>"; };
36+
7C236D201DC8C60F00E1F9CF /* LSCContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSCContext.h; sourceTree = "<group>"; };
37+
7C236D211DC8C60F00E1F9CF /* LSCFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSCFunction.h; sourceTree = "<group>"; };
38+
7C236D221DC8C60F00E1F9CF /* LSCModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSCModule.h; sourceTree = "<group>"; };
39+
7C236D231DC8C60F00E1F9CF /* LSCObjectClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSCObjectClass.h; sourceTree = "<group>"; };
40+
7C236D241DC8C60F00E1F9CF /* LSCPointer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSCPointer.h; sourceTree = "<group>"; };
41+
7C236D251DC8C60F00E1F9CF /* LSCTypeDefinied.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSCTypeDefinied.h; sourceTree = "<group>"; };
42+
7C236D261DC8C60F00E1F9CF /* LSCValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSCValue.h; sourceTree = "<group>"; };
43+
7C236D271DC8C60F00E1F9CF /* LuaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuaScriptCore.h; sourceTree = "<group>"; };
44+
7C236D281DC8C60F00E1F9CF /* libLuaScriptCore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libLuaScriptCore.a; sourceTree = "<group>"; };
4545
7C5A617D1D6AE2A3007D4308 /* Sample-OSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Sample-OSX.app"; sourceTree = BUILT_PRODUCTS_DIR; };
4646
7C5A617F1D6AE2A3007D4308 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
4747
7C5A61801D6AE2A3007D4308 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -91,34 +91,34 @@
9191
isa = PBXFrameworksBuildPhase;
9292
buildActionMask = 2147483647;
9393
files = (
94-
7C236D0E1DC87E7900E1F9CF /* libLuaScriptCore.a in Frameworks */,
94+
7C236D291DC8C60F00E1F9CF /* libLuaScriptCore.a in Frameworks */,
9595
);
9696
runOnlyForDeploymentPostprocessing = 0;
9797
};
9898
/* End PBXFrameworksBuildPhase section */
9999

100100
/* Begin PBXGroup section */
101-
7C236D031DC87E7900E1F9CF /* LuaScriptCore */ = {
101+
7C236D1E1DC8C60F00E1F9CF /* LuaScriptCore */ = {
102102
isa = PBXGroup;
103103
children = (
104-
7C236D041DC87E7900E1F9CF /* include */,
105-
7C236D0D1DC87E7900E1F9CF /* libLuaScriptCore.a */,
104+
7C236D1F1DC8C60F00E1F9CF /* include */,
105+
7C236D281DC8C60F00E1F9CF /* libLuaScriptCore.a */,
106106
);
107107
name = LuaScriptCore;
108108
path = ../../../Release/iOS;
109109
sourceTree = "<group>";
110110
};
111-
7C236D041DC87E7900E1F9CF /* include */ = {
111+
7C236D1F1DC8C60F00E1F9CF /* include */ = {
112112
isa = PBXGroup;
113113
children = (
114-
7C236D051DC87E7900E1F9CF /* LSCContext.h */,
115-
7C236D061DC87E7900E1F9CF /* LSCFunction.h */,
116-
7C236D071DC87E7900E1F9CF /* LSCModule.h */,
117-
7C236D081DC87E7900E1F9CF /* LSCObjectClass.h */,
118-
7C236D091DC87E7900E1F9CF /* LSCPointer.h */,
119-
7C236D0A1DC87E7900E1F9CF /* LSCTypeDefinied.h */,
120-
7C236D0B1DC87E7900E1F9CF /* LSCValue.h */,
121-
7C236D0C1DC87E7900E1F9CF /* LuaScriptCore.h */,
114+
7C236D201DC8C60F00E1F9CF /* LSCContext.h */,
115+
7C236D211DC8C60F00E1F9CF /* LSCFunction.h */,
116+
7C236D221DC8C60F00E1F9CF /* LSCModule.h */,
117+
7C236D231DC8C60F00E1F9CF /* LSCObjectClass.h */,
118+
7C236D241DC8C60F00E1F9CF /* LSCPointer.h */,
119+
7C236D251DC8C60F00E1F9CF /* LSCTypeDefinied.h */,
120+
7C236D261DC8C60F00E1F9CF /* LSCValue.h */,
121+
7C236D271DC8C60F00E1F9CF /* LuaScriptCore.h */,
122122
);
123123
path = include;
124124
sourceTree = "<group>";
@@ -150,7 +150,7 @@
150150
7C6B12721D6AFD1400489D9E /* Sample-iOS */ = {
151151
isa = PBXGroup;
152152
children = (
153-
7C236D031DC87E7900E1F9CF /* LuaScriptCore */,
153+
7C236D1E1DC8C60F00E1F9CF /* LuaScriptCore */,
154154
7C6B12731D6AFD1400489D9E /* AppDelegate.h */,
155155
7C6B12741D6AFD1400489D9E /* AppDelegate.m */,
156156
7C6B12751D6AFD1400489D9E /* Assets.xcassets */,

‎Source/Android/luascriptcore/src/main/java/cn/vimfung/luascriptcore/LuaModule.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,10 @@ else if (paramType.isAssignableFrom(boolean[].class))
289289
argumentArray.add(item.toArrayList().toArray());
290290
}
291291
}
292+
else
293+
{
294+
argumentArray.add(item.toObject());
295+
}
292296

293297
}
294298

0 commit comments

Comments
 (0)