Skip to content

Commit ed0a4a5

Browse files
PonyCuiPonyCui
authored
Merge pull request svga#99 from yyued/2.5.0-release
2.5.0 release
2 parents c06532d + 34ef59f commit ed0a4a5

File tree

17 files changed

+259
-97
lines changed

17 files changed

+259
-97
lines changed

‎CHANGELOG.md‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,49 @@
1-
# SVGAPlayer-iOS (2019-06-20)
1+
# SVGAPlayer-iOS CHANGELOG (2019-10-15)
22

3-
## [Next release](https://github.com/yyued/SVGAPlayer-iOS/compare/2.5.0...2.3.3) (2019-06-20)
3+
## [2.5.0](https://github.com/yyued/SVGAPlayer-iOS/tree/2.5.0-release)(2019-10-15)
4+
5+
### Features
6+
7+
* Add Support for matte layer and dynamic matte bitmap.
8+
* Add Support for audio step to frame & percentage.
9+
10+
## [2.3.5](https://github.com/yyued/SVGAPlayer-iOS/compare/2.3.4...2.3.5) (2019-09-29)
411

512
### Bug Fixes
613

7-
* Verify failureBlock. ([05f4159](https://github.com/yyued/SVGAPlayer-iOS/commit/05f41593190e6606b8427d49a97d48ffb4329dc4))
14+
* Let clearsAfterStop defaults too YES. ([4932be5](https://github.com/yyued/SVGAPlayer-iOS/commit/4932be5))
15+
* Add support for audio play in stepToFrame. ([873f8e4](https://github.com/yyued/SVGAPlayer-iOS/commit/873f8e4))
16+
* Correct mp3 file match in proto image for iOS13. ([eb45964](https://github.com/yyued/SVGAPlayer-iOS/commit/eb45964))
17+
* Correct ZIP file match when parse for iOS13. ([f3e204f](https://github.com/yyued/SVGAPlayer-iOS/commit/f3e204f))
18+
19+
## [2.3.4](https://github.com/yyued/SVGAPlayer-iOS/compare/2.3.3...2.3.4) (2019-08-02)
20+
21+
### Bug Fixes
22+
23+
* Correct file tag des hit target. ([0018e13](https://github.com/yyued/SVGAPlayer-iOS/commit/0018e13))
24+
* Correct file tag des hit target. ([dc2e403](https://github.com/yyued/SVGAPlayer-iOS/commit/dc2e403))
25+
* Fix static layer. ([ab1d4fc](https://github.com/yyued/SVGAPlayer-iOS/commit/ab1d4fc))
26+
* Fix demo aspect scale. ([33ea6b3](https://github.com/yyued/SVGAPlayer-iOS/commit/33ea6b3))
27+
* Fix key for svga 1.x format. ([ec43259](https://github.com/yyued/SVGAPlayer-iOS/commit/ec43259))
28+
* Return when videoItem is nil in startAnimation. ([cb27f0f](https://github.com/yyued/SVGAPlayer-iOS/commit/cb27f0f))
829

930
### Features
1031

11-
* Add 2.x proto support for matte. ([6ec6b29](https://github.com/yyued/SVGAPlayer-iOS/commit/6ec6b29))
32+
* Add 2.x proto support for matte. ([527e76f](https://github.com/yyued/SVGAPlayer-iOS/commit/527e76f))
1233
* Add slider for animation demo. ([fc9d7ef](https://github.com/yyued/SVGAPlayer-iOS/commit/fc9d7ef))
1334
* Support bitmap matte layer. ([4c4e2b1](https://github.com/yyued/SVGAPlayer-iOS/commit/4c4e2b1))
1435
* Support muti mask. ([188c1b3](https://github.com/yyued/SVGAPlayer-iOS/commit/188c1b3))
15-
16-
17-
## [2.3.2](https://github.com/yyued/SVGAPlayer-iOS/compare/2.3.1...2.3.2) (2018-12-26)
18-
36+
* Update 2.x proto support for matte. ([2b28845](https://github.com/yyued/SVGAPlayer-iOS/commit/2b28845))
1937

2038
### Bug Fixes
2139

2240
* Rollback SSZipArchive to 1.8.1 because of crash. ([2f9d94b](https://github.com/yyued/SVGAPlayer-iOS/commit/2f9d94b))
2341

24-
25-
2642
## [2.3.1](https://github.com/yyued/SVGAPlayer-iOS/compare/2.3.0...2.3.1) (2018-12-18)
2743

28-
2944
### Bug Fixes
3045

31-
* add enabledMemoryCache option to SVGAParser, disable memory cache to default. ([116a91f](https://github.com/yyued/SVGAPlayer-iOS/commit/116a91f))
46+
* Add enabledMemoryCache option to SVGAParser, disable memory cache to default. ([116a91f](https://github.com/yyued/SVGAPlayer-iOS/commit/116a91f))
3247

3348
## 2.3.0
3449

@@ -56,3 +71,6 @@
5671
### Bug Fixes
5772
* Use CADisplayLink::invalid() replace removeFromRunloop.
5873
improve: all Parser callback will perform on Main Thread.
74+
75+
76+

‎Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ DEPENDENCIES:
4747
- Yoga
4848

4949
SPEC REPOS:
50-
https://github.com/cocoapods/specs.git:
50+
https://github.com/CocoaPods/Specs.git:
5151
- Protobuf
5252
- SSZipArchive
5353
- Yoga
@@ -64,4 +64,4 @@ SPEC CHECKSUMS:
6464

6565
PODFILE CHECKSUM: 7f6714245d47e69d2933463289e4c4d6de65b831
6666

67-
COCOAPODS: 1.7.3
67+
COCOAPODS: 1.8.0.beta.2

‎SVGAPlayer.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
63712E6821787A45001AE014 /* SVGAAudioEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 63712E6721787A45001AE014 /* SVGAAudioEntity.m */; };
1313
63E817012178809D001D2D62 /* SVGAAudioLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 63E817002178809D001D2D62 /* SVGAAudioLayer.m */; };
1414
71418C93225E6F710029C69E /* mutiMatte.svga in Resources */ = {isa = PBXBuildFile; fileRef = 71418C92225E6F710029C69E /* mutiMatte.svga */; };
15+
718A146D235718E000FED5D3 /* Rocket.svga in Resources */ = {isa = PBXBuildFile; fileRef = 718A146C235718E000FED5D3 /* Rocket.svga */; };
1516
71A8679122B7785100176CD6 /* matteRect.svga in Resources */ = {isa = PBXBuildFile; fileRef = 71A8679022B7785100176CD6 /* matteRect.svga */; };
1617
71A8679322B7853600176CD6 /* matteBitmap.svga in Resources */ = {isa = PBXBuildFile; fileRef = 71A8679222B7853600176CD6 /* matteBitmap.svga */; };
17-
71A8679B22B8CF7400176CD6 /* Goddess.svga in Resources */ = {isa = PBXBuildFile; fileRef = 71A8679A22B8CF7400176CD6 /* Goddess.svga */; };
18+
71DAA8A52355B3ED006608A1 /* Goddess.svga in Resources */ = {isa = PBXBuildFile; fileRef = 71DAA8A42355B3ED006608A1 /* Goddess.svga */; };
1819
80D4C7254846B96B9C6EED83 /* libPods-SVGAPlayer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DDA5FF396660C7C932DF9B8 /* libPods-SVGAPlayer.a */; };
1920
904D41F81D223DD20085A21A /* SVGABezierPath.m in Sources */ = {isa = PBXBuildFile; fileRef = 904D41F71D223DD20085A21A /* SVGABezierPath.m */; };
2021
9052FC631E6EB8D4007BC925 /* SVGAExporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9052FC621E6EB8D4007BC925 /* SVGAExporter.m */; };
@@ -68,9 +69,10 @@
6869
63E816FF2178809D001D2D62 /* SVGAAudioLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGAAudioLayer.h; sourceTree = "<group>"; };
6970
63E817002178809D001D2D62 /* SVGAAudioLayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SVGAAudioLayer.m; sourceTree = "<group>"; };
7071
71418C92225E6F710029C69E /* mutiMatte.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = mutiMatte.svga; sourceTree = "<group>"; };
72+
718A146C235718E000FED5D3 /* Rocket.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = Rocket.svga; sourceTree = "<group>"; };
7173
71A8679022B7785100176CD6 /* matteRect.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = matteRect.svga; sourceTree = "<group>"; };
7274
71A8679222B7853600176CD6 /* matteBitmap.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = matteBitmap.svga; sourceTree = "<group>"; };
73-
71A8679A22B8CF7400176CD6 /* Goddess.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = Goddess.svga; sourceTree = "<group>"; };
75+
71DAA8A42355B3ED006608A1 /* Goddess.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = Goddess.svga; sourceTree = "<group>"; };
7476
8AD65028FA2D122A34DC4A63 /* Pods-SVGAPlayer.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SVGAPlayer.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SVGAPlayer/Pods-SVGAPlayer.debug.xcconfig"; sourceTree = "<group>"; };
7577
904D41F61D223DD20085A21A /* SVGABezierPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGABezierPath.h; sourceTree = "<group>"; };
7678
904D41F71D223DD20085A21A /* SVGABezierPath.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVGABezierPath.m; sourceTree = "<group>"; };
@@ -247,7 +249,8 @@
247249
90D7C9FA1F7E2AA3006E74F0 /* Samples */ = {
248250
isa = PBXGroup;
249251
children = (
250-
71A8679A22B8CF7400176CD6 /* Goddess.svga */,
252+
718A146C235718E000FED5D3 /* Rocket.svga */,
253+
71DAA8A42355B3ED006608A1 /* Goddess.svga */,
251254
71A8679022B7785100176CD6 /* matteRect.svga */,
252255
71A8679222B7853600176CD6 /* matteBitmap.svga */,
253256
71418C92225E6F710029C69E /* mutiMatte.svga */,
@@ -361,6 +364,7 @@
361364
files = (
362365
71418C93225E6F710029C69E /* mutiMatte.svga in Resources */,
363366
90A676F01D13A6DF008A69F3 /* LaunchScreen.storyboard in Resources */,
367+
718A146D235718E000FED5D3 /* Rocket.svga in Resources */,
364368
90A676ED1D13A6DF008A69F3 /* Assets.xcassets in Resources */,
365369
63712E6521787950001AE014 /* heartbeat.svga in Resources */,
366370
90A676EB1D13A6DF008A69F3 /* Main.storyboard in Resources */,
@@ -369,7 +373,7 @@
369373
71A8679322B7853600176CD6 /* matteBitmap.svga in Resources */,
370374
90D7CA1C1F7FB114006E74F0 /* rose_1.5.0.svga in Resources */,
371375
90D7CA1B1F7FB114006E74F0 /* rose_2.0.0.svga in Resources */,
372-
71A8679B22B8CF7400176CD6 /* Goddess.svga in Resources */,
376+
71DAA8A52355B3ED006608A1 /* Goddess.svga in Resources */,
373377
);
374378
runOnlyForDeploymentPostprocessing = 0;
375379
};

‎SVGAPlayer.xcodeproj/xcuserdata/errnull.xcuserdatad/xcschemes/xcschememanagement.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<key>SVGAPlayer.xcscheme_^#shared#^_</key>
1313
<dict>
1414
<key>orderHint</key>
15-
<integer>6</integer>
15+
<integer>5</integer>
1616
</dict>
1717
</dict>
1818
<key>SuppressBuildableAutocreation</key>

‎SVGAPlayer.xcworkspace/xcuserdata/errnull.xcuserdatad/UserInterfaceState.xcuserstate‎

-13.4 KB
Binary file not shown.

‎SVGAPlayer.xcworkspace/xcuserdata/errnull.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist‎

Lines changed: 76 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,136 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Bucket
3-
uuid = "64DA03BB-C5DC-42D4-BADC-AD0639445B58"
3+
uuid = "62068DA9-4A75-4226-A638-9340300C6605"
44
type = "0"
55
version = "2.0">
66
<Breakpoints>
77
<BreakpointProxy
88
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
99
<BreakpointContent
10-
uuid = "3AE24567-7384-4566-B71B-DED67D03525A"
10+
uuid = "4B3D1F80-8EF8-4233-8D9D-0B2454FF1D73"
1111
shouldBeEnabled = "Yes"
1212
ignoreCount = "0"
1313
continueAfterRunningActions = "No"
14-
filePath = "SVGAPlayer/ViewController.m"
14+
filePath = "Source/SVGAParser.m"
15+
timestampString = "592814888.7285351"
1516
startingColumnNumber = "9223372036854775807"
1617
endingColumnNumber = "9223372036854775807"
17-
startingLineNumber = "66"
18-
endingLineNumber = "66"
19-
landmarkName = "-onSliderClick:"
18+
startingLineNumber = "282"
19+
endingLineNumber = "282"
20+
landmarkName = "-parseWithData:cacheKey:completionBlock:failureBlock:"
2021
landmarkType = "7">
2122
</BreakpointContent>
2223
</BreakpointProxy>
2324
<BreakpointProxy
2425
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
2526
<BreakpointContent
26-
uuid = "D8154CC8-03F2-40FD-87BF-47C3CFBDBFC5"
27+
uuid = "EE5F9C78-0C52-4896-AAE6-9B6CCE0422A6"
2728
shouldBeEnabled = "Yes"
2829
ignoreCount = "0"
2930
continueAfterRunningActions = "No"
30-
filePath = "Source/SVGAPlayer.m"
31+
filePath = "Source/SVGAParser.m"
32+
timestampString = "592814888.728616"
3133
startingColumnNumber = "9223372036854775807"
3234
endingColumnNumber = "9223372036854775807"
33-
startingLineNumber = "125"
34-
endingLineNumber = "125"
35-
landmarkName = "-stepToFrame:andPlay:"
35+
startingLineNumber = "146"
36+
endingLineNumber = "146"
37+
landmarkName = "-parseWithCacheKey:completionBlock:failureBlock:"
3638
landmarkType = "7">
39+
<Locations>
40+
<Location
41+
shouldBeEnabled = "Yes"
42+
ignoreCount = "0"
43+
continueAfterRunningActions = "No"
44+
symbolName = "__61-[SVGAParser parseWithCacheKey:completionBlock:failureBlock:]_block_invoke"
45+
moduleName = "SVGAPlayer"
46+
usesParentBreakpointCondition = "Yes"
47+
urlString = "file:///Users/errnull/Desktop/Code_errnull/SVGA/SVGAPlayer-iOS/Source/SVGAParser.m"
48+
timestampString = "592808732.094293"
49+
startingColumnNumber = "9223372036854775807"
50+
endingColumnNumber = "9223372036854775807"
51+
startingLineNumber = "147"
52+
endingLineNumber = "147"
53+
offsetFromSymbolStart = "1595">
54+
</Location>
55+
<Location
56+
shouldBeEnabled = "Yes"
57+
ignoreCount = "0"
58+
continueAfterRunningActions = "No"
59+
symbolName = "__61-[SVGAParser parseWithCacheKey:completionBlock:failureBlock:]_block_invoke"
60+
moduleName = "SVGAPlayer"
61+
usesParentBreakpointCondition = "Yes"
62+
urlString = "file:///Users/errnull/Desktop/Code_errnull/SVGA/SVGAPlayer-iOS/Source/SVGAParser.m"
63+
timestampString = "592808732.097017"
64+
startingColumnNumber = "9223372036854775807"
65+
endingColumnNumber = "9223372036854775807"
66+
startingLineNumber = "147"
67+
endingLineNumber = "147"
68+
offsetFromSymbolStart = "1639">
69+
</Location>
70+
</Locations>
3771
</BreakpointContent>
3872
</BreakpointProxy>
3973
<BreakpointProxy
4074
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
4175
<BreakpointContent
42-
uuid = "0AF589EC-210A-4B63-8DCF-18F1727DF3D5"
4376
shouldBeEnabled = "Yes"
4477
ignoreCount = "0"
4578
continueAfterRunningActions = "No"
46-
filePath = "Source/SVGAPlayer.m"
79+
filePath = "Source/SVGAParser.m"
80+
timestampString = "592814888.728675"
4781
startingColumnNumber = "9223372036854775807"
4882
endingColumnNumber = "9223372036854775807"
49-
startingLineNumber = "300"
50-
endingLineNumber = "300"
51-
landmarkName = "-update"
83+
startingLineNumber = "292"
84+
endingLineNumber = "292"
85+
landmarkName = "-parseWithData:cacheKey:completionBlock:failureBlock:"
5286
landmarkType = "7">
5387
</BreakpointContent>
5488
</BreakpointProxy>
5589
<BreakpointProxy
5690
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
5791
<BreakpointContent
58-
uuid = "08D33BAA-30CD-475A-A15C-BE5608038FCD"
5992
shouldBeEnabled = "Yes"
6093
ignoreCount = "0"
6194
continueAfterRunningActions = "No"
62-
filePath = "Source/SVGAPlayer.m"
95+
filePath = "Source/SVGAParser.m"
96+
timestampString = "592814888.7287281"
6397
startingColumnNumber = "9223372036854775807"
6498
endingColumnNumber = "9223372036854775807"
65-
startingLineNumber = "304"
66-
endingLineNumber = "304"
67-
landmarkName = "-update"
99+
startingLineNumber = "150"
100+
endingLineNumber = "150"
101+
landmarkName = "-parseWithCacheKey:completionBlock:failureBlock:"
68102
landmarkType = "7">
69103
</BreakpointContent>
70104
</BreakpointProxy>
71105
<BreakpointProxy
72106
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
73107
<BreakpointContent
74-
uuid = "D6A59950-2B5E-4C3F-A760-A6B911356ECD"
75108
shouldBeEnabled = "Yes"
76109
ignoreCount = "0"
77110
continueAfterRunningActions = "No"
78-
filePath = "Source/SVGAPlayer.m"
111+
filePath = "Source/SVGAVideoEntity.m"
112+
timestampString = "592808732.035756"
79113
startingColumnNumber = "9223372036854775807"
80114
endingColumnNumber = "9223372036854775807"
81-
startingLineNumber = "114"
82-
endingLineNumber = "114"
83-
landmarkName = "-clearAudios"
115+
startingLineNumber = "82"
116+
endingLineNumber = "82"
117+
landmarkName = "-resetImagesWithJSONObject:"
118+
landmarkType = "7">
119+
</BreakpointContent>
120+
</BreakpointProxy>
121+
<BreakpointProxy
122+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
123+
<BreakpointContent
124+
shouldBeEnabled = "Yes"
125+
ignoreCount = "0"
126+
continueAfterRunningActions = "No"
127+
filePath = "Source/SVGAVideoEntity.m"
128+
timestampString = "592808732.035814"
129+
startingColumnNumber = "9223372036854775807"
130+
endingColumnNumber = "9223372036854775807"
131+
startingLineNumber = "90"
132+
endingLineNumber = "90"
133+
landmarkName = "-resetImagesWithJSONObject:"
84134
landmarkType = "7">
85135
</BreakpointContent>
86136
</BreakpointProxy>

‎SVGAPlayer/Assets.xcassets/Contents.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
}
6+
}

‎SVGAPlayer/Assets.xcassets/begin.imageset/Contents.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "[email protected]",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎SVGAPlayer/Assets.xcassets/begin.imageset/[email protected]‎

606 Bytes
Loading

‎SVGAPlayer/Assets.xcassets/purse.imageset/Contents.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "[email protected]",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

0 commit comments

Comments
 (0)