pixuireactcomponents 1.5.29 → 1.5.31

package/package.json

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

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

@@ -88,12 +88,14 @@ var videoLog = function () {
 };
 export var VideoPlayer = function (props) {
     var rootId = props.rootId, rootClassName = props.rootClassName, _a = props.playUrl, playUrl = _a === void 0 ? '' : _a, _b = props.autoPlay, autoPlay = _b === void 0 ? true : _b, playEvent = props.playEvent, iconElement = props.iconElement, _c = props.hideSliderDuration, hideSliderDuration = _c === void 0 ? 3000 : _c, sliderElement = props.sliderElement, videoDuration = props.videoDuration, compRef = props.compRef;
-    var isStreaming = !playUrl.endsWith('.mp4');
+    var isStreaming = !playUrl.split('?')[0].endsWith('.mp4');
     var refVideo = useRef(null);
     var _d = useState(VideoStatus.Loading), videoStatus = _d[0], setVideoStatus = _d[1];
     var _e = useState(0), currentTime = _e[0], setCurrentTime = _e[1];
     var _f = useState(0), totalTime = _f[0], setTotalTime = _f[1];
     var _g = useState(false), showSlider = _g[0], setShowSlider = _g[1];
+    var _h = useState(1.0), currentVolume = _h[0], setCurrentVolume = _h[1]; //视频音量范围0.0~1.0
+    var _j = useState(false), isMuted = _j[0], setIsMuted = _j[1];
     var sliderTimmer = useRef(null);
     var rootRef = useRef();
     var isDragingRef = useRef(false);
@@ -133,26 +135,27 @@ export var VideoPlayer = function (props) {
         updatePlayTimeFunRef.current = updatePlayTime;
     });
     useEffect(function () {
-        updatePlayTimeFunRef.current = updatePlayTime;
-        var interval = setInterval(function () {
-            updatePlayTimeFunRef.current();
-        }, 1000);
-        if (isStreaming)
-            return;
-        var playTime = refVideo.current.currentTime;
-        var currentSeconds = Math.floor(playTime / 1000 + 0.5);
-        var duration = getDuration();
-        if (duration == undefined) {
-            console.error('该版本的pixui不支持自动获取视频时长，请手动传入videoDuration');
+        // 如果是直播流则不需要处理进度条
+        if (!isStreaming) {
+            updatePlayTimeFunRef.current = updatePlayTime;
+            var interval_1 = setInterval(function () {
+                updatePlayTimeFunRef.current();
+            }, 1000);
+            var playTime = refVideo.current.currentTime;
+            var currentSeconds = Math.floor(playTime / 1000 + 0.5);
+            var duration = getDuration();
+            if (duration == undefined) {
+                console.error('该版本的pixui不支持自动获取视频时长，请手动传入videoDuration');
+            }
+            var totalSeconds = Math.floor(duration / 1000 + 0.5);
+            setCurrentTime(currentSeconds);
+            setTotalTime(totalSeconds);
+            return function () {
+                clearInterval(interval_1);
+                clearInterval(sliderTimmer.current);
+            };
         }
-        var totalSeconds = Math.floor(duration / 1000 + 0.5);
-        setCurrentTime(currentSeconds);
-        setTotalTime(totalSeconds);
-        return function () {
-            clearInterval(interval);
-            clearInterval(sliderTimmer.current);
-        };
-    }, []);
+    }, [playUrl]);
     // 开始拖就长显Bar
     var onSliderDragStart = function () {
         videoLog('onDragStart-----------------');
@@ -279,6 +282,10 @@ export var VideoPlayer = function (props) {
             load: function () {
                 refVideo.current.load();
             },
+            setMute: function (_muted) {
+                refVideo.current.muted = _muted;
+                setIsMuted(_muted);
+            },
             getPlayStatus: function () {
                 return videoStatus;
             },
@@ -298,8 +305,15 @@ export var VideoPlayer = function (props) {
                     }, 3000);
                 }
             },
+            setCurrentVolume: function (volume) {
+                refVideo.current.volume = volume;
+                setCurrentVolume(volume);
+            },
             currentTime: currentTime,
             totalTime: totalTime,
+            isUIShow: showSlider,
+            currentVolume: currentVolume,
+            isMuted: isMuted
         };
     }
     // videoLog('currentTime', currentTime, 'totalTime', totalTime);
@@ -341,7 +355,7 @@ export var VideoPlayer = function (props) {
                 console.warn('onloadeddata');
             }, onCanPlay: onplaying, 
             //@ts-ignore
-            onfirstframe: onFirstFrame }),
+            onfirstframe: onFirstFrame, controls: true }),
         h("div", { style: screenClickerStyle, onClick: function (e) {
                 videoLog('screenClickerStyle click');
                 e.stopPropagation();