[No ticket] Replace seekToResume with resumePosition (#441)

smlrq · guoen21 · NickWang618 · web-flow · commit a244edf5114d · 2025-08-01T17:27:34.000+08:00
* fix: replace seekToResume with src.resumePosition * fix: clean up SeekToCommand enum * fix:Replace seek to resume with resume position in native player * Revert "fix:Replace seek to resume with resume position in native player" This reverts commit 16bb6e1. * Reapply "fix:Replace seek to resume with resume position in native player" This reverts commit 9697ff7. * chore: apply the changes of move resume position to src for android part (#442) * chore: apply the changes of move resume position to src for android part * chore: bump version --------- Co-authored-by: Guoen Yong <guoen.yong@endeavorstreaming.com> Co-authored-by: Nick Wang <nick.wang@endeavorstreaming.com>
diff --git a/Video.tsx b/Video.tsx
@@ -145,34 +145,6 @@ export default class Video extends React.PureComponent<IVideoPlayer, IState> {
     this.props.onBehindLiveWindowError?.(event.nativeEvent);
   }
 
-  /**
-   * seekToResume jumps to a certain position for vod and live content
-   * time parameter can be the following:
-   * string: unix timestamp (used for live annotation)
-   * number: seconds elapsed (used for vod annotation)
-   * now: for DVR content to jump back to current live time
-   */
-  seekToResume = (time: 'now' | string | number) => {
-    let command = SeekToCommand.SEEK_TO_NOW;
-    const args: Array<string | number> = [];
-
-    if (time !== 'now') {
-      command =
-        typeof time === 'string'
-          ? SeekToCommand.SEEK_TO_TIMESTAMP
-          : SeekToCommand.SEEK_TO_RESUME_POSITION;
-      args.push(time);
-    }
-
-    if (this.refPlayer) {
-      NativeModules.UIManager.dispatchViewManagerCommand(
-        findNodeHandle(this.refPlayer.current),
-        NativeModules.UIManager.RCTVideo.Commands[command],
-        args
-      );
-    }
-  };
-
   /**
    * @description seeks to a specified time in the video
    * @param time video time in seconds
diff --git a/android-exoplayer/src/main/java/com/brentvatne/entity/RNSource.java b/android-exoplayer/src/main/java/com/brentvatne/entity/RNSource.java
@@ -42,6 +42,7 @@ public class RNSource {
     private final YoSsaiProperties yoSsai;
     private final AmtSsaiProperties amtSsai;
     private final LimitedSeekRange limitedSeekRange;
+    private final long resumePosition;
     private final TracksPolicy tracksPolicy;
     private final long dvrSeekForwardInterval;
     private final long dvrSeekBackwardInterval;
@@ -69,6 +70,7 @@ public RNSource(
             @Nullable YoSsaiProperties yoSsai,
             @Nullable AmtSsaiProperties amtSsai,
             @Nullable LimitedSeekRange limitedSeekRange,
+            long resumePosition,
             TracksPolicy tracksPolicy,
             long dvrSeekForwardInterval,
             long dvrSeekBackwardInterval) {
@@ -95,6 +97,7 @@ public RNSource(
         this.yoSsai = yoSsai;
         this.amtSsai = amtSsai;
         this.limitedSeekRange = limitedSeekRange;
+        this.resumePosition = resumePosition;
         this.tracksPolicy = tracksPolicy;
         this.dvrSeekForwardInterval = TimeUnit.SECONDS.toMillis(dvrSeekForwardInterval);
         this.dvrSeekBackwardInterval = TimeUnit.SECONDS.toMillis(dvrSeekBackwardInterval);
@@ -224,6 +227,10 @@ public LimitedSeekRange getLimitedSeekRange() {
         return limitedSeekRange;
     }
 
+    public long getResumePosition() {
+        return resumePosition;
+    }
+
     public TracksPolicy getTracksPolicy() {
         return tracksPolicy;
     }
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactTVExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactTVExoplayerView.java
@@ -621,8 +621,9 @@ private void doInitializePlayer(boolean force) {
             if (limitedSeekRange != null) {
                 sourceBuilder.setLimitedSeekRange(limitedSeekRange);
             } else {
-                sourceBuilder.setResumePosition(resumePosition);
+                sourceBuilder.setResumePosition(src.getResumePosition());
             }
+            clearResumePosition();
             source = sourceBuilder.build();
 
             playerInitTime = new Date().getTime();
@@ -1317,6 +1318,7 @@ public void setSrc(
             boolean apsTestFlag,
             Watermark watermark,
             LimitedSeekRange limitedSeekRange,
+            long resumePosition,
             boolean shouldSaveSubtitleSelection,
             String selectedSubtitleTrack,
             List<String> preferredAudioTracks,
@@ -1368,6 +1370,7 @@ public void setSrc(
                     yoSsai,
                     amtSsai,
                     limitedSeekRange,
+                    resumePosition,
                     tracksPolicy,
                     dvrSeekForwardInterval,
                     dvrSeekBackwardInterval);
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactTVExoplayerViewManager.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactTVExoplayerViewManager.java
@@ -73,6 +73,7 @@ public class ReactTVExoplayerViewManager extends ViewGroupManager<ReactTVExoplay
     private static final String PROP_SRC_APS_TEST_MODE = "testMode";
     private static final String PROP_SRC_METADATA = "metadata";
     private static final String PROP_SRC_LIMIT_RANGE = "limitedSeekableRange";
+    private static final String PROP_SRC_RESUME_POSITION = "resumePosition";
     private static final String PROP_SRC_SAVE_SUBTITLE_SELECTION = "shouldSaveSubtitleSelection";
     private static final String PROP_SRC_NOW_PLAYING = "nowPlaying";
     private static final String PROP_SRC_BIF_URL = "thumbnailsPreview";
@@ -260,6 +261,13 @@ public void setSrc(final ReactTVExoplayerView videoView, @Nullable ReadableMap s
         boolean apsTestMode = (aps != null && aps.hasKey(PROP_SRC_APS_TEST_MODE)) && aps.getBoolean(PROP_SRC_APS_TEST_MODE);
 
         LimitedSeekRange limitedSeekRange = generateRange(src.hasKey(PROP_SRC_LIMIT_RANGE) ? src.getMap(PROP_SRC_LIMIT_RANGE) : null);
+        long resumePosition = ResumePositionHandler.RESUME_UNSET;
+        if (src.hasKey(PROP_SRC_RESUME_POSITION) && !src.isNull(PROP_SRC_RESUME_POSITION)) {
+            long rawPosition = Math.round(src.getDouble(PROP_SRC_RESUME_POSITION));
+            if (rawPosition > 0) {
+                resumePosition = (videoView.isLive() ? rawPosition : rawPosition * 1000);
+            }
+        }
         boolean shouldSaveSubtitleSelection = src.hasKey(PROP_SRC_SAVE_SUBTITLE_SELECTION) && src.getBoolean(PROP_SRC_SAVE_SUBTITLE_SELECTION);
 
         if (src.hasKey(PROP_SRC_NOW_PLAYING)) {
@@ -322,10 +330,11 @@ public void setSrc(final ReactTVExoplayerView videoView, @Nullable ReadableMap s
             ImaCsaiProperties imaCsai = (ImaCsaiProperties) adProperties[0];
             TracksPolicy tracksPolicy = ReactTVPropsParser.parseTracksPolicy(ReadableMapUtils.getMap(src, "tracksPolicy"));
 
-            Log.i(WebUtil.DEBUG, String.format("setSrc - id %s, title %s, mimeType %s, isYoSsai %b, isAmtSsai %b, " +
+            Log.i(WebUtil.DEBUG, String.format("setSrc - id %s, title %s, resumePosition %d, mimeType %s, isYoSsai %b, isAmtSsai %b, " +
                             "isImaDai %b, adTag %s, midRoll %s, license %s, url %s",
                     id,
                     channelName == null && muxData != null && muxData.hasKey("videoTitle") ? muxData.getString("videoTitle") : channelName,
+                    resumePosition,
                     mimeType,
                     adProperties[1] != null,
                     adProperties[2] != null,
@@ -360,6 +369,7 @@ public void setSrc(final ReactTVExoplayerView videoView, @Nullable ReadableMap s
                     apsTestMode,
                     Watermark.fromMap(metadata),
                     limitedSeekRange,
+                    resumePosition,
                     shouldSaveSubtitleSelection,
                     selectedSubtitleTrack,
                     preferredAudioTracks,
@@ -687,42 +697,17 @@ public static Map<String, String> toStringMap(@Nullable ReadableMap readableMap)
     @Override
     public Map<String, Integer> getCommandsMap() {
         return MapBuilder.of(
-                "seekToNow",
-                COMMAND_SEEK_TO_NOW,
-                "seekToTimestamp",
-                COMMAND_SEEK_TO_TIMESTAMP,
-                "seekToResumePosition",
-                COMMAND_SEEK_TO_RESUME_POSITION,
                 "seekToPosition",
                 COMMAND_SEEK_TO_POSITION,
                 "replaceAdTagParameters",
-                COMMAND_REPLACE_AD_TAG_PARAMETERS,
-                "limitSeekableRange",
-                COMMAND_LIMIT_SEEKABLE_RANGE
+                COMMAND_REPLACE_AD_TAG_PARAMETERS
         );
     }
 
     @Override
     public void receiveCommand(final ReactTVExoplayerView root, int commandId, @Nullable ReadableArray args) {
         // This will be called whenever a command is sent from react-native.
         switch (commandId) {
-            case COMMAND_SEEK_TO_NOW:
-                Log.i(WebUtil.DEBUG, "resumeToNow");
-                root.resumeTo(C.TIME_UNSET);
-                break;
-            case COMMAND_SEEK_TO_TIMESTAMP:
-                String timestamp = args.getString(0);
-                Log.i(WebUtil.DEBUG, "resumeToTimeStamp " + timestamp);
-                long positionMs = root.parseTimestamp(timestamp);
-                if (positionMs != ResumePositionHandler.RESUME_UNSET) {
-                    root.resumeTo(positionMs);
-                }
-                break;
-            case COMMAND_SEEK_TO_RESUME_POSITION:
-                long resumeMs = args.getInt(0) * 1000;
-                Log.i(WebUtil.DEBUG, "resumeToPosition " + resumeMs);
-                root.resumeTo(resumeMs);
-                break;
             case COMMAND_SEEK_TO_POSITION:
                 long seekToMs = args.getInt(0) * 1000;
                 Log.i(WebUtil.DEBUG, "seekToPosition " + seekToMs);
@@ -731,9 +716,6 @@ public void receiveCommand(final ReactTVExoplayerView root, int commandId, @Null
             case COMMAND_REPLACE_AD_TAG_PARAMETERS:
                 root.replaceAdTagParameters(args.getMap(0) != null ? args.getMap(0).toHashMap() : null);
                 break;
-            case COMMAND_LIMIT_SEEKABLE_RANGE:
-                root.setLimitedSeekRange(generateRange(args.getMap(0)));
-                break;
         }
     }
 
diff --git a/ios/JSProps/Source.swift b/ios/JSProps/Source.swift
@@ -36,6 +36,7 @@ struct Source: SuperCodable {
     let dvrSeekForwardInterval: Int?
     let dvrSeekBackwardInterval: Int?
     var plugins: JSPlugins?
+    let resumePosition: Int?
 }
 
 
diff --git a/ios/Video/NewPlayerView.swift b/ios/Video/NewPlayerView.swift
@@ -177,13 +177,6 @@ class NewPlayerView: UIView, JSInputProtocol {
     var jsProps = JSProps()
     var jsPlayerView: RNDReactNativeDiceVideo.JSPlayerView?
     
-    func seekToNow() {
-        jsPlayerView?.seekNow()
-    }
-    
-    func seekToTimestamp(isoDate: String) {
-        jsPlayerView?.seek(isoDate)
-    }
     
     //TODO: pass this value as part of source
     func seekToPosition(position: Double) {
@@ -234,24 +227,6 @@ class NewPlayerView: UIView, JSInputProtocol {
         self.jsProps.startAt = Dynamic(nil)
     }
     
-    //moved to source
-    func setInitialSeek(position: Double) {
-        jsProps.startAt.value = position
-    }
-    
-    //moved to source
-    func setupLimitedSeekableRange(with range: Source.LimitedSeekableRange?) {
-        let start = Date(timeIntervalSince1970InMilliseconds: range?.start)
-        let end = Date(timeIntervalSince1970InMilliseconds: range?.end)
-        
-        if let end = end, end > Date() {
-            //avoid finishing playback when ongoing live program reaches its end
-            jsPlayerView?.dorisGlue?.doris?.player.setLimitedSeekableRange(range: (start: start, end: nil))
-        } else {
-            jsPlayerView?.dorisGlue?.doris?.player.setLimitedSeekableRange(range: (start: start, end: end))
-        }
-    }
-    
     override func layoutSubviews() {
         super.layoutSubviews()
         if jsPlayerView == nil {
diff --git a/ios/Video/PlayerViewProxy.swift b/ios/Video/PlayerViewProxy.swift
@@ -238,7 +238,7 @@ class PlayerViewProxy {
                 config: jsConfig,
                 imageUri: jsProps.metadata.value?.thumbnailUrl,
                 thumbnailsPreview: sourceValue.thumbnailsPreview,
-                resumePosition: jsProps.startAt.value,
+                resumePosition: sourceValue.resumePosition.map { Double($0) },
                 delay: nil,
                 ads: sourceValue.ads,
                 metadata: metadata,
diff --git a/ios/Video/RCTVideoManager.m b/ios/Video/RCTVideoManager.m
@@ -64,11 +64,7 @@ @interface RCT_EXTERN_MODULE(RCTVideoManager, RCTViewManager)
 RCT_EXPORT_VIEW_PROPERTY(onSubtitleTrackChanged, RCTBubblingEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onAudioTrackChanged, RCTBubblingEventBlock)
 
-RCT_EXTERN_METHOD(seekToNow:(nonnull NSNumber *)node)
-RCT_EXTERN_METHOD(seekToTimestamp:(nonnull NSNumber *)node isoDate:(NSString *)isoDate)
 RCT_EXTERN_METHOD(seekToPosition:(nonnull NSNumber *)node position:(double)position)
 RCT_EXTERN_METHOD(replaceAdTagParameters:(nonnull NSNumber *)node payload:(NSDictionary)payload)
-RCT_EXTERN_METHOD(seekToResumePosition:(nonnull NSNumber *)node position:(double)position)
-RCT_EXTERN_METHOD(limitSeekableRange:(nonnull NSNumber *)node payload:(NSDictionary)payload)
 
 @end
diff --git a/ios/Video/RCTVideoManager.swift b/ios/Video/RCTVideoManager.swift
@@ -20,22 +20,6 @@ class RCTVideoManager: RCTViewManager {
         return view
     }
     
-    //MARK: Differs (ios only)
-    @objc public func seekToNow(_ node: NSNumber) {
-        DispatchQueue.main.async {
-            let component = self.bridge.uiManager.view(forReactTag: node) as? NewPlayerView
-            component?.seekToNow()
-        }
-    }
-    
-    //MARK: Differs (ios only)
-    @objc public func seekToTimestamp(_ node: NSNumber, isoDate: String) {
-        DispatchQueue.main.async {
-            let component = self.bridge.uiManager.view(forReactTag: node) as? NewPlayerView
-            component?.seekToTimestamp(isoDate: isoDate)
-        }
-    }
-    
     @objc public func seekToPosition(_ node: NSNumber, position: Double) {
         DispatchQueue.main.async {
             let component = self.bridge.uiManager.view(forReactTag: node) as? NewPlayerView
@@ -68,22 +52,6 @@ class RCTVideoManager: RCTViewManager {
                                               validUntil: endDate)
         }
     }
-    
-    @objc public func seekToResumePosition(_ node: NSNumber, position: Double) {
-        DispatchQueue.main.async {
-            let component = self.bridge.uiManager.view(forReactTag: node) as? NewPlayerView
-            component?.setInitialSeek(position: position)
-        }
-    }
-    
-    @objc public func limitSeekableRange(_ node: NSNumber, payload: NSDictionary) {
-        DispatchQueue.main.async {
-            let component = self.bridge.uiManager.view(forReactTag: node) as? NewPlayerView
-            if let limitedSeekbleRange = try? Source.LimitedSeekableRange(dict: payload) {
-                component?.setupLimitedSeekableRange(with: limitedSeekbleRange)
-            }
-        }
-    }
 
     override static func requiresMainQueueSetup() -> Bool {
         return true
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-video",
-    "version": "7.10.16",
+    "version": "7.10.17",
     "dorisAndroidVersion": "3.14.8",
     "messagingAndroidVersion": "1.1.0",
     "description": "A <Video /> element for react-native",
diff --git a/types/SeekToCommand.ts b/types/SeekToCommand.ts
@@ -1,6 +1,3 @@
 export enum SeekToCommand {
-  SEEK_TO_NOW = 'seekToNow',
   SEEK_TO_POSITION = 'seekToPosition',
-  SEEK_TO_RESUME_POSITION = 'seekToResumePosition',
-  SEEK_TO_TIMESTAMP = 'seekToTimestamp',
 }
diff --git a/types/source.ts b/types/source.ts
@@ -85,4 +85,5 @@ export interface IVideoPlayerSource {
   plugins?: IPlugins;
   live?: boolean;
   isAudioOnly?: boolean;
+  resumePosition?: number
 }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ struct Source: SuperCodable {`
`36`	`36`	`let dvrSeekForwardInterval: Int?`
`37`	`37`	`let dvrSeekBackwardInterval: Int?`
`38`	`38`	`var plugins: JSPlugins?`
	`39`	`+ let resumePosition: Int?`
`39`	`40`	`}`
`40`	`41`
`41`	`42`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-native-video",`
`3`		`- "version": "7.10.16",`
	`3`	`+ "version": "7.10.17",`
`4`	`4`	`"dorisAndroidVersion": "3.14.8",`
`5`	`5`	`"messagingAndroidVersion": "1.1.0",`
`6`	`6`	`"description": "A <Video /> element for react-native",`