@cloud-app-dev/vidc 3.2.5 → 3.2.7

package/es/Player/contraller_bar/time.js

@@ -4,16 +4,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useContext } from 'react';
-import { Context } from '../context';
+import React from 'react';
 import { useTimes } from '../timeline';
 import { timeStamp } from '../util';
 function Time() {
-  var _useContext = useContext(Context),
-    api = _useContext.api,
-    event = _useContext.event,
-    isFpsPlay = _useContext.isFpsPlay;
-  var _useTimes = useTimes(api, event, isFpsPlay),
+  var _useTimes = useTimes(),
     _useTimes2 = _slicedToArray(_useTimes, 3),
     current = _useTimes2[0],
     duration = _useTimes2[2];

package/es/Player/contraller_bar/useBarStatus.d.ts

@@ -1,3 +1,2 @@
-import type VideoEventInstance from '../event';
-declare function useBarStatus(event: VideoEventInstance): number;
+declare function useBarStatus(): number;
 export default useBarStatus;

package/es/Player/contraller_bar/useBarStatus.js

@@ -4,10 +4,13 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useState } from 'react';
+import { useContext, useState } from 'react';
+import { Context } from '../context';
 import { useRegisterPlayerEvents } from '../event';
 import EventName from '../event/eventName';
-function useBarStatus(event) {
+function useBarStatus() {
+  var _useContext = useContext(Context),
+    event = _useContext.event;
   var _useState = useState({
       status: 1
     }),

package/es/Player/frontend_player.js

@@ -41,7 +41,6 @@ function FrontendPlayer(_a) {
   var hasReady = api && event;
   var timeline = customTimeLine !== null && customTimeLine !== void 0 ? customTimeLine : /*#__PURE__*/React.createElement(FrontendTimeLine, {
     end: end,
-    url: url,
     onSeek: onSeek,
     begin: begin,
     duration: duration

package/es/Player/frontend_timeline.d.ts

@@ -5,7 +5,6 @@ interface ITimeLineProps {
     begin: number;
     end: number;
     onSeek?: (time: number) => void;
-    url?: string;
 }
-declare function FrontendTimeLine({ duration, begin, end, onSeek, url }: ITimeLineProps): JSX.Element;
+declare function FrontendTimeLine({ duration, begin, end, onSeek }: ITimeLineProps): JSX.Element;
 export default FrontendTimeLine;

package/es/Player/frontend_timeline.js

@@ -5,22 +5,17 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useMemo, useState, startTransition, useContext } from 'react';
+import React, { useMemo, useState, startTransition } from 'react';
 import useBarStatus from './contraller_bar/useBarStatus';
 import { useTimes } from './timeline';
 import { FMT } from './util';
 import moment from 'moment';
-import { Context } from './context';
 import "./style/timeline.css";
 function FrontendTimeLine(_ref) {
   var duration = _ref.duration,
     begin = _ref.begin,
     end = _ref.end,
-    onSeek = _ref.onSeek,
-    url = _ref.url;
-  var _useContext = useContext(Context),
-    api = _useContext.api,
-    event = _useContext.event;
+    onSeek = _ref.onSeek;
   // time 是记录seek时跳了多少
   var _useState = useState({
       time: 0,
@@ -31,9 +26,9 @@ function FrontendTimeLine(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
-  var status = useBarStatus(event);
+  var status = useBarStatus();
   //获取视频当前播放时长单位s
-  var _useTimes = useTimes(api, event),
+  var _useTimes = useTimes(),
     _useTimes2 = _slicedToArray(_useTimes, 1),
     currentTime = _useTimes2[0];
   var rTime = useMemo(function () {

package/es/Player/message.d.ts

@@ -1,11 +1,5 @@
 /// <reference types="react" />
-import Api from './api';
-import VideoEventInstance from './event';
 import './style/message.less';
-interface IVideoMessageProps {
-    event: VideoEventInstance;
-    api: Api;
-}
-declare function VideoMessage({ event, api }: IVideoMessageProps): JSX.Element;
+declare function VideoMessage(): JSX.Element;
 export declare const NoSource: () => JSX.Element;
 export default VideoMessage;

package/es/Player/message.js

@@ -4,17 +4,18 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState, useMemo, useRef } from 'react';
+import React, { useState, useMemo, useRef, useContext } from 'react';
 import IconFont from './iconfont';
 import { useRegisterPlayerEvent, useVideoEvent } from './event';
 import EventName from './event/eventName';
+import { Context } from './context';
 import "./style/message.css";
-function VideoMessage(_ref) {
-  var event = _ref.event,
-    api = _ref.api;
+function VideoMessage() {
+  var _useContext = useContext(Context),
+    api = _useContext.api;
   var _useState = useState({
       status: null,
-      errorTimer: null,
+      errorTimer: 1,
       loading: false
     }),
     _useState2 = _slicedToArray(_useState, 2),

package/es/Player/segment_timeline.js

@@ -6,12 +6,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { startTransition, useContext, useMemo, useState } from 'react';
+import React, { startTransition, useMemo, useState } from 'react';
 import { useTimes } from './timeline';
 import useBarStatus from './contraller_bar/useBarStatus';
 import moment from 'moment';
 import { FMT } from './util';
-import { Context } from './context';
 import "./style/timeline.css";
 function SegmentTimeLine(_ref) {
   var index = _ref.index,
@@ -28,12 +27,8 @@ function SegmentTimeLine(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
-  var _useContext = useContext(Context),
-    api = _useContext.api,
-    event = _useContext.event,
-    isFpsPlay = _useContext.isFpsPlay;
-  var status = useBarStatus(event);
-  var _useTimes = useTimes(api, event, isFpsPlay),
+  var status = useBarStatus();
+  var _useTimes = useTimes(),
     _useTimes2 = _slicedToArray(_useTimes, 2),
     currentTime = _useTimes2[0],
     buffered = _useTimes2[1];

package/es/Player/single_player.js

@@ -180,8 +180,8 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   // 补货视频错误，自定义处理
   useErrorEvent({
     unload: unload,
-    flv: flv,
-    hls: hls,
+    flv: flvRef.current,
+    hls: hlsRef.current,
     api: playApi,
     event: event,
     reload: reload,
@@ -189,7 +189,7 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   });
   // 直播缓冲追回
   useLiveHeart({
-    api: playApi,
+    api: api,
     event: event,
     isLive: isLive
   });
@@ -233,15 +233,9 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     event: event,
     api: playApi,
     fpsDelay: fpsDelay
-  }) : /*#__PURE__*/React.createElement(Empty, null)), hasApiEventInit && hasLink ? /*#__PURE__*/React.createElement(VideoMessage, {
-    api: playApi,
-    event: event
-  }) : /*#__PURE__*/React.createElement(Empty, null), hasApiEventInit && hasLink && !hideContrallerBar ? /*#__PURE__*/React.createElement(ContrallerEvent, {
+  }) : /*#__PURE__*/React.createElement(Empty, null)), hasApiEventInit && hasLink ? /*#__PURE__*/React.createElement(VideoMessage, null) : /*#__PURE__*/React.createElement(Empty, null), hasApiEventInit && hasLink && !hideContrallerBar ? /*#__PURE__*/React.createElement(ContrallerEvent, {
     children: /*#__PURE__*/React.createElement(ContrallerBar, Object.assign({}, contrallerProps))
-  }) : /*#__PURE__*/React.createElement(Empty, null), hasApiEventInit ? customTimeLine ? customTimeLine : !hideContrallerBar ? /*#__PURE__*/React.createElement(Timeline, {
-    api: playApi,
-    event: event
-  }) : /*#__PURE__*/React.createElement(Empty, null) : /*#__PURE__*/React.createElement(Empty, null), children));
+  }) : /*#__PURE__*/React.createElement(Empty, null), hasApiEventInit ? customTimeLine ? customTimeLine : !hideContrallerBar ? /*#__PURE__*/React.createElement(Timeline, null) : /*#__PURE__*/React.createElement(Empty, null) : /*#__PURE__*/React.createElement(Empty, null), children));
 });
 function Empty() {
   return /*#__PURE__*/React.createElement(React.Fragment, null);

package/es/Player/timeline.d.ts

@@ -1,11 +1,5 @@
 /// <reference types="react" />
-import type Api from './api';
-import type VideoEventInstance from './event';
 import './style/timeline.less';
-interface ITimeLineProps {
-    api: Api;
-    event: VideoEventInstance;
-}
-export declare function useTimes(api: Api, event: VideoEventInstance, isFpsPlay?: boolean): number[];
-declare function TimeLine({ api, event }: ITimeLineProps): JSX.Element;
+export declare function useTimes(): number[];
+declare function TimeLine(): JSX.Element;
 export default TimeLine;

package/es/Player/timeline.js

@@ -4,12 +4,15 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useMemo, useState } from 'react';
+import React, { useContext, useMemo, useState } from 'react';
 import useBarStatus from './contraller_bar/useBarStatus';
 import { useVideoEvent } from './event';
+import { Context } from './context';
 import "./style/timeline.css";
-export function useTimes(api, event, isFpsPlay) {
-  console.log(api, event);
+export function useTimes() {
+  var _useContext = useContext(Context),
+    api = _useContext.api,
+    isFpsPlay = _useContext.isFpsPlay;
   var _useState = useState({
       currentTime: 0,
       buffered: 0
@@ -43,11 +46,11 @@ export function useTimes(api, event, isFpsPlay) {
     return [state.currentTime, state.buffered, api.getDuration()];
   }, [state.currentTime, state.buffered, api]);
 }
-function TimeLine(_ref) {
-  var api = _ref.api,
-    event = _ref.event;
-  var status = useBarStatus(event);
-  var _useTimes = useTimes(api, event),
+function TimeLine() {
+  var _useContext2 = useContext(Context),
+    api = _useContext2.api;
+  var status = useBarStatus();
+  var _useTimes = useTimes(),
     _useTimes2 = _slicedToArray(_useTimes, 3),
     currentTime = _useTimes2[0],
     buffered = _useTimes2[1],

package/es/ScreenPlayer/PlayerWithExt.d.ts

@@ -15,6 +15,7 @@ interface ISegmentPlayerWithExtProps extends Omit<ILivePlayerWithExtProps, 'url'
     fpsDelay?: number;
     fps?: number;
     httpLoading: boolean;
+    screenIndex?: number;
 }
 export declare function SegmentPlayerWithExt({ begin, style, className, segments, mode, fpsDelay, fps, httpLoading, ...props }: ISegmentPlayerWithExtProps): JSX.Element;
 interface IFrontendPlayerWithExtProps extends Omit<ILivePlayerWithExtProps, 'url'> {
@@ -25,7 +26,9 @@ interface IFrontendPlayerWithExtProps extends Omit<ILivePlayerWithExtProps, 'url
         url: URL;
         begin: number;
         end: number;
+        screenIndex: number;
     }) => Promise<string>;
+    screenIndex?: number;
 }
-export declare function FrontendPlayerWithExt({ mode, style, className, segments, pluginDownloadUrl, httpLoading, ...props }: IFrontendPlayerWithExtProps): JSX.Element;
+export declare function FrontendPlayerWithExt({ mode, style, className, segments, pluginDownloadUrl, screenIndex, httpLoading, ...props }: IFrontendPlayerWithExtProps): JSX.Element;
 export {};

package/es/ScreenPlayer/PlayerWithExt.js

@@ -101,8 +101,9 @@ export function FrontendPlayerWithExt(_a) {
     className = _a.className,
     segments = _a.segments,
     pluginDownloadUrl = _a.pluginDownloadUrl,
+    screenIndex = _a.screenIndex,
     httpLoading = _a.httpLoading,
-    props = __rest(_a, ["mode", "style", "className", "segments", "pluginDownloadUrl", "httpLoading"]);
+    props = __rest(_a, ["mode", "style", "className", "segments", "pluginDownloadUrl", "screenIndex", "httpLoading"]);
   var _useState = useState({
       begin: 0,
       end: 0,
@@ -131,7 +132,8 @@ export function FrontendPlayerWithExt(_a) {
       props.getLocalRecordUrl({
         url: videoUrl,
         begin: moment(begin).unix(),
-        end: moment(end).unix()
+        end: moment(end).unix(),
+        screenIndex: screenIndex
       }).then(function (url) {
         return setState({
           begin: begin,
@@ -162,7 +164,8 @@ export function FrontendPlayerWithExt(_a) {
       props.getLocalRecordUrl({
         url: videoUrl,
         begin: begin,
-        end: end
+        end: end,
+        screenIndex: screenIndex
       }).then(function (url) {
         return setState(function (old) {
           return Object.assign(Object.assign({}, old), {

package/es/ScreenPlayer/Record.js

@@ -345,7 +345,8 @@ function RecordPlayer(_a) {
       mode: (_a = state.modes["".concat(item === null || item === void 0 ? void 0 : item.date, "-").concat(item.cid)]) !== null && _a !== void 0 ? _a : item.mode,
       fps: fps,
       fpsDelay: fpsDelay,
-      httpLoading: item.loading
+      httpLoading: item.loading,
+      screenIndex: index
     })) : /*#__PURE__*/React.createElement(FrontendPlayerWithExt, Object.assign({}, item, {
       className: state.selectIndex === index ? 'player-current-index' : '',
       segments: (item === null || item === void 0 ? void 0 : item.segments) || [],
@@ -367,7 +368,8 @@ function RecordPlayer(_a) {
       },
       httpLoading: item.loading,
       getLocalRecordUrl: props.getLocalRecordUrl,
-      pluginDownloadUrl: props.pluginDownloadUrl
+      pluginDownloadUrl: props.pluginDownloadUrl,
+      screenIndex: index
     }));
   })), /*#__PURE__*/React.createElement("div", {
     className: "player-tools-group"

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "3.2.5",
+  "version": "3.2.7",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",