feat: Implements poster and playlist support on ios

manse · manse · commit 7e95e96b9178 · 2019-05-27T17:50:32.000+09:00
diff --git a/index.d.ts b/index.d.ts
@@ -3,9 +3,9 @@ import { ViewStyle } from 'react-native';
 
 type VideoToken = string;
 
-export type Props = {
-  policyKey: string;
-  accountId: string;
+export type BrightcovePlayerProps = {
+  policyKey?: string;
+  accountId?: string;
   referenceId?: string;
   videoId?: string;
   videoToken?: VideoToken;
@@ -28,11 +28,37 @@ export type Props = {
   style?: ViewStyle;
 };
 
-export class BrightcovePlayer extends React.Component<Props, {}> {
+export class BrightcovePlayer extends React.Component<
+  BrightcovePlayerProps,
+  {}
+> {
   seekTo(position: number): {};
 }
 
+export type BrightcovePlayerPosterProps = {
+  policyKey?: string;
+  accountId?: string;
+  referenceId?: string;
+  videoId?: string;
+  videoToken?: VideoToken;
+  style?: ViewStyle;
+};
+
+export class BrightcovePlayerPoster extends React.Component<
+  BrightcovePlayerPosterProps,
+  {}
+> {}
+
 export namespace BrightcovePlayerUtil {
+  type PlaylistVideo = {
+    accountId: String;
+    videoId: String;
+    referenceId: String;
+    name: String;
+    description: String;
+    duration: number;
+  };
+
   export function requestDownloadVideoWithReferenceId(
     accountId: string,
     policyKey: string,
@@ -64,4 +90,14 @@ export namespace BrightcovePlayerUtil {
       videoToken: VideoToken;
     }[]
   >;
+  export function getPlaylistWithReferenceId(
+    accountId: string,
+    policyKey: string,
+    referenceId: string
+  ): Promise<PlaylistVideo[]>;
+  export function getPlaylistWithPlaylistId(
+    accountId: string,
+    policyKey: string,
+    playlistId: string
+  ): Promise<PlaylistVideo[]>;
 }
diff --git a/index.js b/index.js
@@ -1,7 +1,9 @@
 const BrightcovePlayer = require('./src/BrightcovePlayer');
+const BrightcovePlayerPoster = require('./src/BrightcovePlayerPoster');
 const BrightcovePlayerUtil = require('./src/BrightcovePlayerUtil');
 
 module.exports = {
   BrightcovePlayer: BrightcovePlayer,
+  BrightcovePlayerPoster: BrightcovePlayerPoster,
   BrightcovePlayerUtil: BrightcovePlayerUtil
 };
diff --git a/ios/BrightcovePlayer.h b/ios/BrightcovePlayer.h
@@ -23,6 +23,7 @@
 @property (nonatomic) float targetVolume;
 @property (nonatomic) float targetBitRate;
 @property (nonatomic) float targetPlaybackRate;
+@property (nonatomic) BOOL playbackServiceDirty;
 
 @property (nonatomic, copy) NSString *referenceId;
 @property (nonatomic, copy) NSString *videoId;
diff --git a/ios/BrightcovePlayer.m b/ios/BrightcovePlayer.m
@@ -31,7 +31,8 @@ - (void)setup {
 }
 
 - (void)setupService {
-    if (!_playbackService && _accountId && _policyKey) {
+    if ((!_playbackService || _playbackServiceDirty) && _accountId && _policyKey) {
+        _playbackServiceDirty = NO;
         _playbackService = [[BCOVPlaybackService alloc] initWithAccountId:_accountId policyKey:_policyKey];
     }
 }
@@ -87,12 +88,14 @@ - (void)setVideoToken:(NSString *)videoToken {
 
 - (void)setAccountId:(NSString *)accountId {
     _accountId = accountId;
+    _playbackServiceDirty = YES;
     [self setupService];
     [self loadMovie];
 }
 
 - (void)setPolicyKey:(NSString *)policyKey {
     _policyKey = policyKey;
+    _playbackServiceDirty = YES;
     [self setupService];
     [self loadMovie];
 }
diff --git a/ios/BrightcovePlayerPoster.h b/ios/BrightcovePlayerPoster.h
@@ -0,0 +1,19 @@
+#import <UIKit/UIKit.h>
+#import <BrightcovePlayerSDK/BCOVPlayerSDKManager.h>
+#import <BrightcovePlayerSDK/BCOVPlaybackService.h>
+#import <React/RCTBridge.h>
+#import <React/UIView+React.h>
+
+@interface BrightcovePlayerPoster : UIImageView
+
+@property (nonatomic) BCOVPlaybackService *playbackService;
+@property (nonatomic) BOOL playbackServiceDirty;
+
+@property (nonatomic, copy) NSURLSession *session;
+@property (nonatomic, copy) NSString *referenceId;
+@property (nonatomic, copy) NSString *videoId;
+@property (nonatomic, copy) NSString *videoToken;
+@property (nonatomic, copy) NSString *accountId;
+@property (nonatomic, copy) NSString *policyKey;
+
+@end
diff --git a/ios/BrightcovePlayerPoster.m b/ios/BrightcovePlayerPoster.m
@@ -0,0 +1,108 @@
+#import "BrightcovePlayerPoster.h"
+#import "BrightcovePlayerOfflineVideoManager.h"
+
+@interface BrightcovePlayerPoster ()
+@end
+
+@implementation BrightcovePlayerPoster
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    if (self = [super initWithFrame:frame]) {
+        self.contentMode = UIViewContentModeScaleAspectFill;
+        self.clipsToBounds = YES;
+    }
+    return self;
+}
+
+- (void)setReferenceId:(NSString *)referenceId {
+    _referenceId = referenceId;
+    _videoId = NULL;
+    [self setupService];
+    [self loadPoster];
+}
+
+- (void)setVideoId:(NSString *)videoId {
+    _videoId = videoId;
+    _referenceId = NULL;
+    [self setupService];
+    [self loadPoster];
+}
+
+- (void)setVideoToken:(NSString *)videoToken {
+    _videoToken = videoToken;
+    [self loadPoster];
+}
+
+- (void)setAccountId:(NSString *)accountId {
+    _accountId = accountId;
+    _playbackServiceDirty = YES;
+    [self setupService];
+    [self loadPoster];
+}
+
+- (void)setPolicyKey:(NSString *)policyKey {
+    _policyKey = policyKey;
+    _playbackServiceDirty = YES;
+    [self setupService];
+    [self loadPoster];
+}
+
+- (void)setResizeMode:(NSString *)resizeMode {
+    if ([resizeMode isEqualToString:@"contain"]) {
+        self.contentMode = UIViewContentModeScaleAspectFit;
+    } else if ([resizeMode isEqualToString:@"fit"]) {
+        self.contentMode = UIViewContentModeScaleToFill;
+    } else {
+        self.contentMode = UIViewContentModeScaleAspectFill;
+    }
+}
+
+- (void)setupService {
+    if ((!_playbackService || _playbackServiceDirty) && _accountId && _policyKey) {
+        _playbackServiceDirty = NO;
+        _playbackService = [[BCOVPlaybackService alloc] initWithAccountId:_accountId policyKey:_policyKey];
+    }
+}
+
+- (void)loadPoster {
+    if (_videoToken) {
+        BCOVVideo *video = [[BrightcovePlayerOfflineVideoManager sharedManager] videoObjectFromOfflineVideoToken:_videoToken];
+        if (video) {
+            self.image = [UIImage imageWithContentsOfFile:video.properties[kBCOVOfflineVideoPosterFilePathPropertyKey]];
+        }
+        return;
+    }
+    if (!_playbackService) return;
+    if (_videoId) {
+        [_playbackService findVideoWithVideoID:_videoId parameters:nil completion:^(BCOVVideo *video, NSDictionary *jsonResponse, NSError *error) {
+            if (video) {
+                [self loadImage:video.properties[kBCOVVideoPropertyKeyPoster]];
+            }
+        }];
+    } else if (_referenceId) {
+        [_playbackService findVideoWithReferenceID:_referenceId parameters:nil completion:^(BCOVVideo *video, NSDictionary *jsonResponse, NSError *error) {
+            if (video) {
+                [self loadImage:video.properties[kBCOVVideoPropertyKeyPoster]];
+            }
+        }];
+    }
+}
+
+-(void)loadImage:(NSString *)url{
+    if (_session) {
+        [_session invalidateAndCancel];
+    }
+    if (!url) return;
+    _session = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]
+                                             delegate:nil
+                                        delegateQueue:[NSOperationQueue mainQueue]];
+    NSURLSessionTask *task = [_session dataTaskWithURL:[NSURL URLWithString:url] completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+        if (error || !data) {
+            return;
+        }
+        self.image = [UIImage imageWithData:data];
+    }];
+    [task resume];
+}
+
+@end
diff --git a/ios/BrightcovePlayerPosterManager.h b/ios/BrightcovePlayerPosterManager.h
@@ -0,0 +1,5 @@
+#import <React/RCTViewManager.h>
+
+@interface BrightcovePlayerPosterManager : RCTViewManager
+
+@end
diff --git a/ios/BrightcovePlayerPosterManager.m b/ios/BrightcovePlayerPosterManager.m
@@ -0,0 +1,26 @@
+#import "BrightcovePlayerPosterManager.h"
+#import "BrightcovePlayerPoster.h"
+#import <React/RCTUIManager.h>
+
+@implementation BrightcovePlayerPosterManager
+
+RCT_EXPORT_MODULE();
+
+@synthesize bridge = _bridge;
+
+- (UIView *)view {
+    return [[BrightcovePlayerPoster alloc] init];
+}
+
+- (dispatch_queue_t)methodQueue {
+    return _bridge.uiManager.methodQueue;
+}
+
+RCT_EXPORT_VIEW_PROPERTY(policyKey, NSString);
+RCT_EXPORT_VIEW_PROPERTY(accountId, NSString);
+RCT_EXPORT_VIEW_PROPERTY(videoId, NSString);
+RCT_EXPORT_VIEW_PROPERTY(referenceId, NSString);
+RCT_EXPORT_VIEW_PROPERTY(videoToken, NSString);
+RCT_EXPORT_VIEW_PROPERTY(resizeMode, NSString);
+
+@end
diff --git a/ios/BrightcovePlayerUtil.m b/ios/BrightcovePlayerUtil.m
@@ -2,8 +2,6 @@
 #import "BrightcovePlayerUtil.h"
 #import "BrightcovePlayerOfflineVideoManager.h"
 
-static BOOL sharedOfflineVideoManagerInitialized = false;
-
 @implementation BrightcovePlayerUtil
 
 RCT_EXPORT_MODULE();
@@ -53,7 +51,7 @@ - (dispatch_queue_t)methodQueue {
 }
 
 RCT_EXPORT_METHOD(getOfflineVideoStatuses:(NSString *)accountId policyKey:(NSString *)policyKey resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-    resolve([self collecteOfflineVideoStatuses]);
+    resolve([self collectOfflineVideoStatuses]);
 }
 
 RCT_EXPORT_METHOD(deleteOfflineVideo:(NSString *)accountId policyKey:(NSString *)policyKey videoToken:(NSString *)videoToken resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
@@ -62,7 +60,29 @@ - (dispatch_queue_t)methodQueue {
     resolve(nil);
 }
 
-- (NSArray *)collecteOfflineVideoStatuses {
+RCT_EXPORT_METHOD(getPlaylistWithPlaylistId:(NSString *)playlistId accountId:(NSString *)accountId policyKey:(NSString *)policyKey resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    BCOVPlaybackService* playbackService = [[BCOVPlaybackService alloc] initWithAccountId:accountId policyKey:policyKey];
+    [playbackService findPlaylistWithPlaylistID:playlistId parameters:nil completion:^(BCOVPlaylist *playlist, NSDictionary *jsonResponse, NSError *error) {
+        if (error) {
+            reject(@"error", error.description, error);
+            return;
+        }
+        resolve([self collectPlaylist:playlist]);
+    }];
+}
+
+RCT_EXPORT_METHOD(getPlaylistWithReferenceId:(NSString *)referenceId accountId:(NSString *)accountId policyKey:(NSString *)policyKey resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    BCOVPlaybackService* playbackService = [[BCOVPlaybackService alloc] initWithAccountId:accountId policyKey:policyKey];
+    [playbackService findPlaylistWithReferenceID:referenceId parameters:nil completion:^(BCOVPlaylist *playlist, NSDictionary *jsonResponse, NSError *error) {
+        if (error) {
+            reject(@"error", error.description, error);
+            return;
+        }
+        resolve([self collectPlaylist:playlist]);
+    }];
+}
+
+- (NSArray *)collectOfflineVideoStatuses {
     NSArray* statuses = [[BrightcovePlayerOfflineVideoManager sharedManager] offlineVideoStatus];
     NSMutableArray *results = [[NSMutableArray alloc] init];
     for (BCOVOfflineVideoStatus *status in statuses) {
@@ -75,6 +95,30 @@ - (NSArray *)collecteOfflineVideoStatuses {
     return results;
 }
 
+- (NSArray *)collectPlaylist:(BCOVPlaylist *)playlist {
+    NSMutableArray *videos = [[NSMutableArray alloc] init];
+    for (BCOVVideo *video in playlist.videos) {
+        NSString *name = video.properties[kBCOVVideoPropertyKeyName];
+        if (!name) {
+            name = @"";
+        }
+        NSString *description = video.properties[kBCOVVideoPropertyKeyDescription];
+        if (!description) {
+            description = @"";
+        }
+        [videos addObject:
+         @{
+           @"accountId": video.properties[kBCOVVideoPropertyKeyAccountId],
+           @"videoId": video.properties[kBCOVVideoPropertyKeyId],
+           @"referenceId": video.properties[kBCOVVideoPropertyKeyReferenceId],
+           @"name": name,
+           @"description": description,
+           @"duration": video.properties[kBCOVVideoPropertyKeyDuration]
+           }];
+    }
+    return videos;
+}
+
 - (NSDictionary *)generateDownloadParameterWithBitRate:(NSNumber*)bitRate {
     return
     @{
diff --git a/ios/react-native-brightcove-player.xcodeproj/project.pbxproj b/ios/react-native-brightcove-player.xcodeproj/project.pbxproj
diff --git a/src/BrightcovePlayerPoster.js b/src/BrightcovePlayerPoster.js
diff --git a/src/BrightcovePlayerUtil.js b/src/BrightcovePlayerUtil.js

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ - (void)setup {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`- (void)setupService {`
`34`		`- if (!_playbackService && _accountId && _policyKey) {`
	`34`	`+ if ((!_playbackService \|\| _playbackServiceDirty) && _accountId && _policyKey) {`
	`35`	`+ _playbackServiceDirty = NO;`
`35`	`36`	`_playbackService = [[BCOVPlaybackService alloc] initWithAccountId:_accountId policyKey:_policyKey];`
`36`	`37`	`}`
`37`	`38`	`}`
`@@ -87,12 +88,14 @@ - (void)setVideoToken:(NSString *)videoToken {`
`87`	`88`
`88`	`89`	`- (void)setAccountId:(NSString *)accountId {`
`89`	`90`	`_accountId = accountId;`
	`91`	`+ _playbackServiceDirty = YES;`
`90`	`92`	`[self setupService];`
`91`	`93`	`[self loadMovie];`
`92`	`94`	`}`
`93`	`95`
`94`	`96`	`- (void)setPolicyKey:(NSString *)policyKey {`
`95`	`97`	`_policyKey = policyKey;`
	`98`	`+ _playbackServiceDirty = YES;`
`96`	`99`	`[self setupService];`
`97`	`100`	`[self loadMovie];`
`98`	`101`	`}`