pixuireactcomponents 1.5.21 → 1.5.22

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pixuireactcomponents",
-    "version": "1.5.21",
+    "version": "1.5.22",
     "description": "pixui react components",
     "main": "index.js",
     "scripts": {

package/src/components/react/app/videoPlayer/VideoPlayer.js

@@ -97,6 +97,10 @@ export var VideoPlayer = function (props) {
     var sliderTimmer = useRef(null);
     var rootRef = useRef();
     var isDragingRef = useRef(false);
+    // 在开发setCurrentTime功能时，发现seek视频后立刻pause, 视频会在onpause回调执行后，
+    // 又执行一遍onwating, onplaying回调，导致videoStatus被错误设置成播放状态。
+    // 暂时使用isPauseSeekingRef来标记是否在暂停状态下setCurrentTime触发，在onplaying中将状态设回Pause
+    var isPauseSeekingRef = useRef(false);
     var updatePlayTime = function () {
         if (videoStatus != VideoStatus.Playing || isStreaming)
             return;
@@ -192,6 +196,11 @@ export var VideoPlayer = function (props) {
     var onplaying = function () {
         // 加载第一帧画面
         videoLog('-----------onplaying');
+        if (isPauseSeekingRef.current) {
+            isPauseSeekingRef.current = false;
+            setVideoStatus(VideoStatus.Pause);
+            return;
+        }
         setVideoStatus(VideoStatus.Playing);
         (playEvent === null || playEvent === void 0 ? void 0 : playEvent.onPlay) && playEvent.onPlay();
     };
@@ -273,8 +282,24 @@ export var VideoPlayer = function (props) {
             getPlayStatus: function () {
                 return videoStatus;
             },
+            setCurrentTime: function (currentTime) {
+                var _currentSeconds = Math.floor(currentTime / 1000 + 0.5);
+                setCurrentTime(_currentSeconds);
+                refVideo.current.seek(_currentSeconds);
+                if (videoStatus === VideoStatus.Playing) {
+                    refVideo.current.play();
+                }
+                else if (videoStatus === VideoStatus.Pause) {
+                    isPauseSeekingRef.current = true;
+                    refVideo.current.pause();
+                    // 留出3000ms视频加载时间，复位isSeekingRef
+                    setTimeout(function () {
+                        isPauseSeekingRef.current = false;
+                    }, 3000);
+                }
+            },
             currentTime: currentTime,
-            totalTime: totalTime
+            totalTime: totalTime,
         };
     }
     // videoLog('currentTime', currentTime, 'totalTime', totalTime);