8000 Merge branch 'dev_5.5.0' into develop · newcoderzhang/LuaViewSDK@0ebe3ca · GitHub
[go: up one dir, main page]
Skip to content

Commit 0ebe3ca

Browse files
author
野松
committed
Merge branch 'dev_5.5.0' into develop
2 parents ce6dc47 + 9c0bbc9 commit 0ebe3ca

File tree

101 files changed

+3109
-663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+3109
-663
lines changed

‎Android/LuaViewDemo/LuaViewDemo.iml

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1916
<task>generateDebugSources</task>
2017
</afterSyncTasks>
2118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -25,59 +22,91 @@
2522
</component>
2623
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2724
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
25+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2926
<exclude-output />
3027
<content url="file://$MODULE_DIR$">
3128
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3229
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3330
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3431
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3533
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3735
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3836
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3937
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4038
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4140
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4342
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/res" type="java-resource" />
4443
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/resources" type="java-resource" />
4544
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/assets" type="java-resource" />
4645
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/aidl" isTestSource="false" />
4746
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/java" isTestSource="false" />
4847
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/jni" isTestSource="false" />
4948
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/rs" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/shaders" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5058
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
5159
<sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
5260
<sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
5361
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
5462
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
5564
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5665
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
5766
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
5867
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
5968
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6069
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6170
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
6280
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
6383
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
6484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
65-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
6685
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
6793
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
6995
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
7197
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
7299
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
74101
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
75102
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
76103
</content>
77104
<orderEntry type="jdk" jdkName="Maven Android API 23 Platform" jdkType="Android SDK" />
78105
<orderEntry type="sourceFolder" forTests="false" />
79106
<orderEntry type="library" exported="" name="glide-3.7.0" level="project" />
80-
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
81107
<orderEntry type="module" module-name="LuaViewSDK" exported="" />
108+
<orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
109+
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
110+
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
82111
</component>
83112
</module>

‎Android/LuaViewDemo/assets/test/main.lua renamed to ‎Android/LuaViewDemo/assets/test/DEMO_Time.lua

File renamed without changes.

‎Android/LuaViewDemo/assets/test/NUI_LuaView.lua renamed to ‎Android/LuaViewDemo/assets/test/NUI_CallLua.lua

File renamed without changes.

‎Android/LuaViewDemo/assets/test/NUI_DynamicCode.lua

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
2+
---------------------------------------------------------------------------
3+
print("case1:")
4+
5+
code = [[
6+
param = "Hello world!!!"
7+
print(param)
8+
]]
9+
10+
11+
hi = load(code)
12+
hi()
13+
14+
---------------------------------------------------------------------------
15+
16+
print("case2:")
17+
18+
hi2 = load("param = param .. 'ha ha ha '; x = 1; x = x+1; print(param, x)")
19+
hi2()
20+
21+
hi3 = load("x=x+1; print(param, x)")
22+
hi3()
23+
24+
hi4 = load("fun = function() print('this is a function') end")
25+
hi4()
26+
fun()
27+
28+
fun2 = nil
29+
hi5 = load("fun2 = function(p) print('this is a function', p) end")
30+
hi5()
31+
fun2("hahaha")
32+
33+
34+
35+
---------------------------------------------------------------------------
36+
print("case3:")
37+
38+
x = "hello abc"
39+
40+
dump = string:dump(function() print(x) end)
41+
42+
hello = load(dump)
43+
hello()
44+
45+
---------------------------------------------------------------------------
46+
print("case4:")
47+
48+
audioplayer = loadfile("NUI_AudioPlayer.lua")
49+
audioplayer()
50+

‎Android/LuaViewDemo/assets/test/NUI_File.lua

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
require "kit/lv_kit"
2+
3+
local label = Label()
4+
label.text("请看日志输出")
5+
label.frame(0, 0, System.screenSize())
6+
7+
http = Http()
8+
http.get("http://www.baidu.com", {
9+
query = 1
10+
}, function(response)
11+
local data = response:data()
12+
13+
print(data)
14+
test1(data)
15+
test2(data)
16+
test3(data)
17+
end)
18+
19+
20+
function test1(data)
21+
print("-------------------------test1---------------------")
22+
print("save", File.save(data, "test.html"))
23+
print("read", File.read("test.html"))
24+
print("path", File.path("test.html"))
25+
print("exists", File.exists("test.html"))
26+
print("--------------------------test1---------------------")
27+
end
28+
29+
function test2(data)
30+
print("-------------------------test2---------------------")
31+
print("save", File.save(data, "demo/test.html"))
32+
print("read", File.read("demo/test.html"))
33+
print("path", File.path("demo/test.html"))
34+
print("exists", File.exists("demo/test.html"))
35+
print("--------------------------test2---------------------")
36+
end
37+
38+
function test3(data)
39+
print("-------------------------test3---------------------")
40+
print("save", File.save(data, "../../../common/test.html"))
41+
print("read", File.read("../../../common/test.html"))
42+
print("path", File.path("../../../common/test.html"))
43+
print("exists", File.exists("../../../common/test.html"))
44+
print("--------------------------test3---------------------")
45+
end
46+
47+
function test4(data)
48+
print("-------------------------test4---------------------")
49+
50+
File.save(data, "test1.html", function(status)
51+
print("file saved", status, File.exists("test1.html"))
52+
print("read1", File.read("test1.html"), "xxx")
53+
54+
55+
print("path2", File.path("test1.html"))
56+
print("exists1", File.exists("test1.html"))
57+
print("exists3", File.exists("test2.html"))
58+
59+
File.read("test1.html", function(data)
60+
print("read2", data)
61+
print("-------------------------test4---------------------")
62+
end)
63+
end)
64+
65+
66+
end
67+
68+
69+
70+
71+
http = Http()
72+
http.get("https://gju1.alicdn.com/bao/uploaded/i4/100000120700895002/TB2Qu0_fXXXXXb9XpXXXXXXXXXX_!!0-0-juitemmedia.jpg_560x560Q90.jpg", function(response)
73+
local data = response:data()
74+
75+
File.save(data, "../common/test.png")
76+
77+
File.read("../common/test.png", function(data)
78+
local img = Image()
79+
img.frame(0, 0, 100, 100)
80+
img.image("../common/test.png")
81+
82+
local img2 = Image()
83+
img2.frame(101, 0, 100, 100)
84+
img2.image(data)
85+
end)
86+
end)

0 commit comments

Comments
 (0)
0