Renamed event constants

This commit is contained in:
Johannes Lumpe 2015-04-08 11:58:00 +03:00 committed by Brent Vatne
parent 6988c85268
commit 3b34df57ad
3 changed files with 15 additions and 15 deletions

View File

@ -1,9 +1,9 @@
#import "RCTView.h" #import "RCTView.h"
extern NSString *const RNVideoLoadedEvent; extern NSString *const RNVideoEventLoaded;
extern NSString *const RNVideoLoadingEvent; extern NSString *const RNVideoEventLoading;
extern NSString *const RNVideoProgressEvent; extern NSString *const RNVideoEventProgress;
extern NSString *const RNVideoLoadingErrorEvent; extern NSString *const RNVideoEventLoadingError;
@class RCTEventDispatcher; @class RCTEventDispatcher;

View File

@ -5,10 +5,10 @@
#import "UIView+React.h" #import "UIView+React.h"
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
NSString *const RNVideoLoadedEvent = @"videoLoaded"; NSString *const RNVideoEventLoaded = @"videoLoaded";
NSString *const RNVideoLoadingEvent = @"videoLoading"; NSString *const RNVideoEventLoading = @"videoLoading";
NSString *const RNVideoProgressEvent = @"videoProgress"; NSString *const RNVideoEventProgress = @"videoProgress";
NSString *const RNVideoLoadingErrorEvent = @"videoLoadError"; NSString *const RNVideoEventLoadingError = @"videoLoadError";
static NSString *const statusKeyPath = @"status"; static NSString *const statusKeyPath = @"status";
@ -54,7 +54,7 @@ static NSString *const statusKeyPath = @"status";
if (_prevProgressUpdateTime == nil || if (_prevProgressUpdateTime == nil ||
(([_prevProgressUpdateTime timeIntervalSinceNow] * -1000.0) >= _progressUpdateInterval)) { (([_prevProgressUpdateTime timeIntervalSinceNow] * -1000.0) >= _progressUpdateInterval)) {
[_eventDispatcher sendInputEventWithName:RNVideoProgressEvent body:@{ [_eventDispatcher sendInputEventWithName:RNVideoEventProgress body:@{
@"currentTime": [NSNumber numberWithFloat:CMTimeGetSeconds(video.currentTime)], @"currentTime": [NSNumber numberWithFloat:CMTimeGetSeconds(video.currentTime)],
@"target": self.reactTag @"target": self.reactTag
}]; }];
@ -88,7 +88,7 @@ static NSString *const statusKeyPath = @"status";
[self.layer addSublayer:_playerLayer]; [self.layer addSublayer:_playerLayer];
self.layer.needsDisplayOnBoundsChange = YES; self.layer.needsDisplayOnBoundsChange = YES;
[_eventDispatcher sendInputEventWithName:RNVideoLoadingEvent body:@{ [_eventDispatcher sendInputEventWithName:RNVideoEventLoadingError body:@{
@"src": @{ @"src": @{
@"uri":uri, @"uri":uri,
@"type": type, @"type": type,
@ -101,7 +101,7 @@ static NSString *const statusKeyPath = @"status";
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context { - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
if (object == _playerItem) { if (object == _playerItem) {
if (_playerItem.status == AVPlayerItemStatusReadyToPlay) { if (_playerItem.status == AVPlayerItemStatusReadyToPlay) {
[_eventDispatcher sendInputEventWithName:RNVideoLoadedEvent body:@{ [_eventDispatcher sendInputEventWithName:RNVideoEventLoaded body:@{
@"duration": [NSNumber numberWithFloat:CMTimeGetSeconds(_playerItem.duration)], @"duration": [NSNumber numberWithFloat:CMTimeGetSeconds(_playerItem.duration)],
@"currentTime": [NSNumber numberWithFloat:CMTimeGetSeconds(_playerItem.currentTime)], @"currentTime": [NSNumber numberWithFloat:CMTimeGetSeconds(_playerItem.currentTime)],
@"canPlayReverse": [NSNumber numberWithBool:_playerItem.canPlayReverse], @"canPlayReverse": [NSNumber numberWithBool:_playerItem.canPlayReverse],

View File

@ -17,16 +17,16 @@
- (NSDictionary *)customDirectEventTypes - (NSDictionary *)customDirectEventTypes
{ {
return @{ return @{
RNVideoLoadingEvent: @{ RNVideoEventLoading: @{
@"registrationName": @"onLoadStart" @"registrationName": @"onLoadStart"
}, },
RNVideoLoadedEvent: @{ RNVideoEventLoaded: @{
@"registrationName": @"onLoad" @"registrationName": @"onLoad"
}, },
RNVideoLoadingErrorEvent: @{ RNVideoEventLoadingError: @{
@"registrationName": @"onError" @"registrationName": @"onError"
}, },
RNVideoProgressEvent: @{ RNVideoEventProgress: @{
@"registrationName": @"onProgress" @"registrationName": @"onProgress"
}, },
}; };