Skip to content

Commit a00dc0d

Browse files
authored
Fix/utv 4075 (#445)
* fix: UTV-4075 Create an event for skip intro in native video player * chore: bump RNDV and dorisAndroidVersion * chore: bump version * chore: add onVideoSeek map with RNDV onVideoSeek * bump: RNDV
1 parent fd5427c commit a00dc0d

File tree

6 files changed

+15
-4
lines changed

6 files changed

+15
-4
lines changed

Video.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@ export default class Video extends React.PureComponent<IVideoPlayer, IState> {
125125
this.props.onWatchlistButtonClick?.(event.nativeEvent);
126126
};
127127

128+
onSkipMarkerButton = (event) => {
129+
this.props.onSkipMarkerButton?.(event.nativeEvent);
130+
};
131+
128132
replaceAdTagParameters = (payload: IVideoReplaceAdTagParametersPayload) => {
129133
let command = 'replaceAdTagParameters';
130134

@@ -198,6 +202,7 @@ export default class Video extends React.PureComponent<IVideoPlayer, IState> {
198202
onWatchlistButtonClick: this.onWatchlistButtonClick,
199203
onReloadCurrentSource: this.onReloadCurrentSource,
200204
onBehindLiveWindowError: this.onBehindLiveWindowError,
205+
onSkipMarkerButton: this.onSkipMarkerButton,
201206
};
202207
};
203208

ios/Video/JSInputProtocol.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@ protocol JSInputProtocol: AnyObject {
3737
var onAnnotationsButtonClick: RCTBubblingEventBlock? { get }
3838
var onSubtitleTrackChanged: RCTBubblingEventBlock? { get }
3939
var onAudioTrackChanged: RCTBubblingEventBlock? { get }
40+
var onSkipMarkerButton: RCTBubblingEventBlock? { get }
4041
}

ios/Video/NewPlayerView.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ class NewPlayerView: UIView, JSInputProtocol {
3232
@objc var onEpgIconClick: RCTBubblingEventBlock?
3333
@objc var onAnnotationsButtonClick: RCTBubblingEventBlock?
3434
@objc var onWatchlistButtonClick: RCTBubblingEventBlock?
35+
@objc var onSkipMarkerButton: RCTBubblingEventBlock?
36+
@objc var onVideoSeek: RCTBubblingEventBlock?
3537

3638
//not used
3739
@objc var onVideoLoadStart: RCTBubblingEventBlock?
38-
@objc var onVideoSeek: RCTBubblingEventBlock?
3940
@objc var onTimedMetadata: RCTBubblingEventBlock?
4041
@objc var onVideoAudioBecomingNoisy: RCTBubblingEventBlock?
4142
@objc var onVideoFullscreenPlayerWillPresent: RCTBubblingEventBlock?
@@ -213,6 +214,8 @@ class NewPlayerView: UIView, JSInputProtocol {
213214
jsPlayerView.onEpgIconClick = self.onEpgIconClick
214215
jsPlayerView.onAnnotationsButtonClick = self.onAnnotationsButtonClick
215216
jsPlayerView.onWatchlistButtonClick = self.onWatchlistButtonClick
217+
jsPlayerView.onSkipMarkerButton = self.onSkipMarkerButton
218+
jsPlayerView.onSeekEvent = self.onVideoSeek
216219
jsPlayerView.onVideoBuffer = self.onVideoBuffer
217220
jsPlayerView.onVideoAboutToEnd = self.onVideoAboutToEnd
218221

ios/Video/RCTVideoManager.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ @interface RCT_EXTERN_MODULE(RCTVideoManager, RCTViewManager)
6363
RCT_EXPORT_VIEW_PROPERTY(onAnnotationsButtonClick, RCTBubblingEventBlock);
6464
RCT_EXPORT_VIEW_PROPERTY(onSubtitleTrackChanged, RCTBubblingEventBlock);
6565
RCT_EXPORT_VIEW_PROPERTY(onAudioTrackChanged, RCTBubblingEventBlock)
66+
RCT_EXPORT_VIEW_PROPERTY(onSkipMarkerButton, RCTBubblingEventBlock);
6667

6768
RCT_EXTERN_METHOD(seekToPosition:(nonnull NSNumber *)node position:(double)position)
6869
RCT_EXTERN_METHOD(replaceAdTagParameters:(nonnull NSNumber *)node payload:(NSDictionary)payload)

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "react-native-video",
3-
"version": "7.11.1",
4-
"dorisAndroidVersion": "5.1.6",
3+
"version": "7.11.2",
4+
"dorisAndroidVersion": "5.1.11",
55
"messagingAndroidVersion": "1.1.0",
66
"description": "A <Video /> element for react-native",
77
"main": "Video.tsx",
@@ -21,7 +21,7 @@
2121
"eslint-plugin-react": "3.16.1"
2222
},
2323
"dependencies": {
24-
"@dicetechnology/react-native-dice-video": "git+ssh://[email protected]/DiceTechnology/react-native-dice-video.git#7.0.17",
24+
"@dicetechnology/react-native-dice-video": "git+ssh://[email protected]/DiceTechnology/react-native-dice-video.git#7.1.7",
2525
"@dicetechnology/dice-unity": "^2.26.3",
2626
"keymirror": "0.1.1",
2727
"prop-types": "^15.5.10"

types/callbacks.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ export interface IVideoPlayerCallbacks {
2626
onBehindLiveWindowError?: (e: any) => void;
2727
onAudioTrackChanged?: ({ language } : { language: string }) => void;
2828
onSubtitleTrackChanged?: ({ language } : { language: string }) => void;
29+
onSkipMarkerButton?: (e: any) => void;
2930
}

0 commit comments

Comments
 (0)