Skip to content
This repository has been archived by the owner on Feb 6, 2023. It is now read-only.

1、增加点击事件回调功能 #127

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ DEPENDENCIES:
- Yoga

SPEC REPOS:
https://github.com/cocoapods/specs.git:
https://github.com/CocoaPods/Specs.git:
- Protobuf
- SSZipArchive
- Yoga
Expand All @@ -64,4 +64,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 7f6714245d47e69d2933463289e4c4d6de65b831

COCOAPODS: 1.7.4
COCOAPODS: 1.8.4
2 changes: 1 addition & 1 deletion SVGAPlayer.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Pod::Spec.new do |s|
s.name = "SVGAPlayer"
s.version = "2.5.2"
s.version = "2.5.4"
s.summary = "SVGAPlayer 是一个高性能的动画播放器"
s.description = <<-DESC
SVGA 是一个私有的动画格式,由 YY UED 主导开发。
Expand Down
3 changes: 3 additions & 0 deletions Source/SVGAPlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

typedef void(^SVGAPlayerDynamicDrawingBlock)(CALayer *contentLayer, NSInteger frameIndex);

typedef void(^SVGAEventBlock)(SVGAPlayer *player);

@interface SVGAPlayer : UIView

@property (nonatomic, weak) id<SVGAPlayerDelegate> delegate;
Expand All @@ -44,6 +46,7 @@ typedef void(^SVGAPlayerDynamicDrawingBlock)(CALayer *contentLayer, NSInteger fr
- (void)setImage:(UIImage *)image forKey:(NSString *)aKey referenceLayer:(CALayer *)referenceLayer; // deprecated from 2.0.1
- (void)setAttributedText:(NSAttributedString *)attributedText forKey:(NSString *)aKey;
- (void)setDrawingBlock:(SVGAPlayerDynamicDrawingBlock)drawingBlock forKey:(NSString *)aKey;
- (void)setEventBlock:(SVGAEventBlock)eventBlock forKey:(NSString *)aKey;
- (void)setHidden:(BOOL)hidden forKey:(NSString *)aKey;
- (void)clearDynamicObjects;

Expand Down
41 changes: 41 additions & 0 deletions Source/SVGAPlayer.m
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ @interface SVGAPlayer ()
@property (nonatomic, copy) NSDictionary<NSString *, UIImage *> *dynamicObjects;
@property (nonatomic, copy) NSDictionary<NSString *, NSAttributedString *> *dynamicTexts;
@property (nonatomic, copy) NSDictionary<NSString *, SVGAPlayerDynamicDrawingBlock> *dynamicDrawings;
@property (nonatomic, copy) NSDictionary<NSString *, SVGAEventBlock> *dynamicEvents;
@property (nonatomic, copy) NSDictionary<NSString *, NSNumber *> *dynamicHiddens;
@property (nonatomic, assign) int loopCount;
@property (nonatomic, assign) NSRange currentRange;
Expand Down Expand Up @@ -389,6 +390,29 @@ - (void)setVideoItem:(SVGAVideoEntity *)videoItem {
}];
}

- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
UITouch *touch = touches.anyObject;
CGPoint touchPoint = [touch locationInView:touch.view];
if (self.contentLayers.count > 0) {
for (SVGAContentLayer *layer in self.contentLayers) {
if ([layer isKindOfClass:[SVGAContentLayer class]]) {
for (NSString *key in self.dynamicEvents.allKeys) {
if ([layer.imageKey isEqualToString:key]) {
CGRect layerRect = layer.bounds;
CGPoint layerPoint = [layer convertPoint:touchPoint fromLayer:self.layer];
SVGAEventBlock block = self.dynamicEvents[key];
if (CGRectContainsPoint(layerRect, layerPoint)) {
if (block) {
block(self);
}
}
}
}
}
}
}
}

#pragma mark - Dynamic Object

- (void)setImage:(UIImage *)image forKey:(NSString *)aKey {
Expand Down Expand Up @@ -469,6 +493,15 @@ - (void)setDrawingBlock:(SVGAPlayerDynamicDrawingBlock)drawingBlock forKey:(NSSt
}
}

- (void)setEventBlock:(SVGAEventBlock)eventBlock forKey:(NSString *)aKey {
if (eventBlock == nil || aKey.length <= 0) {
return;
}
NSMutableDictionary *mutableDynamicEvents = [self.dynamicEvents mutableCopy];
[mutableDynamicEvents setObject:eventBlock forKey:aKey];
self.dynamicEvents = mutableDynamicEvents.copy;
}

- (void)setHidden:(BOOL)hidden forKey:(NSString *)aKey {
NSMutableDictionary *mutableDynamicHiddens = [self.dynamicHiddens mutableCopy];
[mutableDynamicHiddens setObject:@(hidden) forKey:aKey];
Expand All @@ -488,6 +521,7 @@ - (void)clearDynamicObjects {
self.dynamicTexts = nil;
self.dynamicHiddens = nil;
self.dynamicDrawings = nil;
self.dynamicEvents = nil;
}

- (NSDictionary *)dynamicObjects {
Expand Down Expand Up @@ -518,4 +552,11 @@ - (NSDictionary *)dynamicHiddens {
return _dynamicDrawings;
}

- (NSDictionary<NSString *,SVGAEventBlock> *)dynamicEvents {
if (_dynamicEvents == nil) {
_dynamicEvents = @{};
}
return _dynamicEvents;
}

@end