feat: Correct mp3 file match in proto image.

zhanduojian · zhanduojian · commit eb4596498a6d · 2019-09-29T19:31:58.000+08:00
diff --git a/Source/SVGAVideoEntity.m b/Source/SVGAVideoEntity.m
@@ -13,6 +13,8 @@
 #import "SVGAAudioEntity.h"
 #import "Svga.pbobjc.h"
 
+#define MP3_MAGIC_NUMBER "ID3"
+
 @interface SVGAVideoEntity ()
 
 @property (nonatomic, assign) CGSize videoSize;
@@ -85,7 +87,7 @@ - (void)resetImagesWithJSONObject:(NSDictionary *)JSONObject {
                     if (imageData != nil) {
                         UIImage *image = [[UIImage alloc] initWithData:imageData scale:2.0];
                         if (image != nil) {
-                            [images setObject:image forKey:key];
+                            [images setObject:image forKey:[key stringByDeletingPathExtension]];
                         }
                     }
                 }
@@ -131,6 +133,14 @@ - (void)resetMovieWithProtoObject:(SVGAProtoMovieEntity *)protoObject {
     }
 }
 
++ (BOOL)isMP3Data:(NSData *)data {
+    BOOL result = NO;
+    if (!strncmp([data bytes], MP3_MAGIC_NUMBER, strlen(MP3_MAGIC_NUMBER))) {
+        result = YES;
+    }
+    return result;
+}
+
 - (void)resetImagesWithProtoObject:(SVGAProtoMovieEntity *)protoObject {
     NSMutableDictionary<NSString *, UIImage *> *images = [[NSMutableDictionary alloc] init];
     NSMutableDictionary<NSString *, NSData *> *audiosData = [[NSMutableDictionary alloc] init];
@@ -153,9 +163,7 @@ - (void)resetImagesWithProtoObject:(SVGAProtoMovieEntity *)protoObject {
             }
         }
         else if ([protoImages[key] isKindOfClass:[NSData class]]) {
-            NSData *fileTag = [protoImages[key] subdataWithRange:NSMakeRange(0, 4)];
-            NSString *fileTagDes = [fileTag description];
-            if (![fileTagDes containsString:@"89504e47"]) {
+            if ([SVGAVideoEntity isMP3Data:protoImages[key]]) {
                 // mp3
                 [audiosData setObject:protoImages[key] forKey:key];
             } else {
@@ -208,6 +216,7 @@ @interface SVGAVideoSpriteEntity()
 
 @property (nonatomic, copy) NSString *imageKey;
 @property (nonatomic, copy) NSArray<SVGAVideoSpriteFrameEntity *> *frames;
+@property (nonatomic, copy) NSString *matteKey;
 
 @end
 
