Skip to content

Commit ff2235e

Browse files
committed
Merge branch 'release/0.2.12'
2 parents 5f0ef2c + 058d106 commit ff2235e

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

ios/RNJWPlayer/RNJWPlayerView.m

+4-4
Original file line numberDiff line numberDiff line change
@@ -397,14 +397,13 @@ -(JWPlayerItem*)getPlayerItem:item
397397
NSString *tag = [item objectForKey:@"tag"];
398398
NSURL* tagUrl = [NSURL URLWithString:tag];
399399

400-
JWAdBreak *adBreak = [JWAdBreak init];
401400
JWAdBreakBuilder* adBreakBuilder = [[JWAdBreakBuilder alloc] init];
402401
JWAdOffset* offset = [JWAdOffset fromString:offsetString];
403402

404403
[adBreakBuilder offset:offset];
405404
[adBreakBuilder tags:@[tagUrl]];
406405

407-
adBreak = [adBreakBuilder buildAndReturnError:&error];
406+
JWAdBreak *adBreak = [adBreakBuilder buildAndReturnError:&error];
408407

409408
[adsArray addObject:adBreak];
410409
}
@@ -546,14 +545,13 @@ -(JWPlayerConfiguration*)getPlayerConfiguration:config
546545
NSString *tag = [item objectForKey:@"tag"];
547546
NSURL* tagUrl = [NSURL URLWithString:tag];
548547

549-
JWAdBreak *adBreak = [JWAdBreak init];
550548
JWAdBreakBuilder* adBreakBuilder = [[JWAdBreakBuilder alloc] init];
551549
JWAdOffset* offset = [JWAdOffset fromString:offsetString];
552550

553551
[adBreakBuilder offset:offset];
554552
[adBreakBuilder tags:@[tagUrl]];
555553

556-
adBreak = [adBreakBuilder buildAndReturnError:&error];
554+
JWAdBreak *adBreak = [adBreakBuilder buildAndReturnError:&error];
557555

558556
[scheduleArray addObject:adBreak];
559557
}
@@ -690,6 +688,8 @@ -(void)presentPlayerViewController:(JWPlayerConfiguration*)configuration
690688
}
691689
}
692690

691+
[_playerViewController setDelegates];
692+
693693
// _playerViewController.delegate = self;
694694
// _playerViewController.playerView.delegate = self;
695695
// _playerViewController.player.delegate = self;

ios/RNJWPlayer/RNJWPlayerViewController.h

+2
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@
2424

2525
@property(nonatomic, strong)RNJWPlayerView *parentView;
2626

27+
-(void)setDelegates;
28+
2729
@end

ios/RNJWPlayer/RNJWPlayerViewController.m

+8-12
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,14 @@
99

1010
@implementation RNJWPlayerViewController
1111

12-
- (instancetype)init
13-
{
14-
self = [super init];
15-
if (self) {
16-
self.delegate = self;
17-
self.playerView.delegate = self;
18-
self.player.delegate = self;
19-
self.player.playbackStateDelegate = self;
20-
self.player.adDelegate = self;
21-
self.player.avDelegate = self;
22-
}
23-
return self;
12+
-(void)setDelegates
13+
{
14+
self.delegate = self;
15+
self.playerView.delegate = self;
16+
self.player.delegate = self;
17+
self.player.playbackStateDelegate = self;
18+
self.player.adDelegate = self;
19+
self.player.avDelegate = self;
2420
}
2521

2622
#pragma mark - JWPlayer Delegate

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-jw-media-player",
3-
"version": "0.2.11",
3+
"version": "0.2.12",
44
"description": "React-native Android/iOS plugin for JWPlayer SDK (https://www.jwplayer.com/)",
55
"main": "index.js",
66
"types": "./index.d.ts",

0 commit comments

Comments
 (0)