@cloud-app-dev/vidc 3.0.2 → 3.0.5

package/es/Player/segment_player.js

@@ -1,4 +1,5 @@
 import _useUpdate from "ahooks/es/useUpdate";
+import _useLatest from "ahooks/es/useLatest";
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -138,6 +139,15 @@ function SegmentPlayer(_a) {
       customTimeLine = _a.customTimeLine,
       props = __rest(_a, ["segments", "begin", "forwordRef", "defaultIndex", "onCanPlayerInit", "customTimeLine"]);
 
+  var _useState3 = useState({
+    seekTime: 0
+  }),
+      _useState4 = _slicedToArray(_useState3, 2),
+      state = _useState4[0],
+      setState = _useState4[1];
+
+  var latestSegmentsRef = _useLatest(segments);
+
   var update = _useUpdate();
 
   var ref = useRef(null);
@@ -160,22 +170,50 @@ function SegmentPlayer(_a) {
       setIndex = _usePlayIndex.setIndex;
 
   var url = useMemo(function () {
-    return segments && segments[index] ? segments[index].url : undefined;
+    return segments[index] ? segments[index].url : undefined;
   }, [segments, index]); // 重置reload
 
   var reload = function reload() {
     playRef.current.event.emit(Events.RELOAD);
     setIndex(0);
     playRef.current.api.reload();
-  }; // 秒级别转换
+  }; // time 毫秒的时间戳
+
+
+  var seekTo = function seekTo(time) {
+    var index = latestSegmentsRef.current.findIndex(function (v) {
+      return time >= v.beginTime && time < v.endTime;
+    });
+
+    if (index === -1) {
+      return;
+    }
+
+    var currentTime = time - latestSegmentsRef.current[index].beginTime;
+    setIndex(index);
+    setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        seekTime: currentTime / 1000
+      });
+    });
+  }; // 处理seek 后index变化后 cuurenttime变化的过程
 
 
-  var beginTemp = useMemo(function () {
-    return begin ? String(begin).length === 10 ? Math.floor(begin * 1000) : begin : begin;
-  }, [begin]);
+  useEffect(function () {
+    if (state.seekTime === 0) {
+      return;
+    }
+
+    setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        seekTime: 0
+      });
+    });
+    playRef.current.video.currentTime = state.seekTime; // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [state.seekTime]);
   var hasReady = api && event;
   var timeline = customTimeLine !== null && customTimeLine !== void 0 ? customTimeLine : /*#__PURE__*/React.createElement(SegmentTimeLine, {
-    begin: beginTemp,
+    begin: begin,
     api: api,
     event: event,
     index: index,
@@ -193,7 +231,8 @@ function SegmentPlayer(_a) {
     onCanPlayerInit: onInit,
     reload: reload,
     extActions: {
-      setIndex: setIndex
+      setIndex: setIndex,
+      seekTo: seekTo
     },
     customTimeLine: hasReady ? timeline : /*#__PURE__*/React.createElement(React.Fragment, null)
   }, props));

package/es/Player/single_player.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import type { ISinglePlayerProps, ExportPlayerType } from './player';
 import './style/index.less';
-declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<ISinglePlayerProps & React.RefAttributes<ExportPlayerType>>>;
-export default _default;
+declare const SinglePlayer: React.ForwardRefExoticComponent<ISinglePlayerProps & React.RefAttributes<ExportPlayerType>>;
+export default SinglePlayer;

package/es/Player/single_player.js

@@ -16,6 +16,7 @@ import { __rest } from "tslib";
 import React, { useEffect, useMemo, useRef, useState, useImperativeHandle } from 'react';
 import { usePlayerApi } from './api';
 import { usePlayerEvent, useRegisterPlayerEvents, useVideoEvents } from './event';
+import EventName from './event/eventName';
 import ContrallerBar from './contraller_bar';
 import ContrallerEvent from './contraller_bar/contraller_event';
 import LiveHeart from './live_heart';
@@ -99,7 +100,11 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
         container: domRef.current
       });
     });
-  }, []); // 特殊接口实现 reload是可能被重写的,但是API只暴露原生的方法
+  }, []); // url 变化清理错误次数
+
+  useEffect(function () {
+    event && event.emit(EventName.CLEAR_ERROR_TIMER); // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [url]); // 特殊接口实现 reload是可能被重写的,但是API只暴露原生的方法
 
   var reload = function reload() {
     return playReload(video, event, flv, hls, url);
@@ -228,4 +233,4 @@ SinglePlayer.defaultProps = {
   hlsConfig: {},
   extActions: {}
 };
-export default /*#__PURE__*/React.memo(SinglePlayer);
+export default SinglePlayer;

package/es/ScreenPlayer/Live.js

@@ -14,6 +14,7 @@ import React, { useMemo, useRef, useState } from 'react';
 import { ScreenType, mergeFill } from './utils';
 import { LivePlayerWithExt } from './PlayerWithExt';
 import Tools from './LiveTools';
+import useVideoFit from './useVideoFit';
 import "./index.css";
 
 function LivePlayer(_ref) {
@@ -30,7 +31,12 @@ function LivePlayer(_ref) {
       state = _useState2[0],
       setState = _useState2[1];
 
-  var domRef = useRef(null); // 缓存所有player对象
+  var domRef = useRef(null);
+
+  var _useVideoFit = useVideoFit(domRef, []),
+      fit = _useVideoFit.fit,
+      toggleFit = _useVideoFit.toggleFit; // 缓存所有player对象
+
 
   var playerRef = useRef([]);
   var screenType = useMemo(function () {
@@ -96,6 +102,8 @@ function LivePlayer(_ref) {
       }
     }));
   })), /*#__PURE__*/React.createElement(Tools, {
+    fit: fit,
+    toggleFit: toggleFit,
     getPlayerItem: getPlayerItem,
     screenNum: state.screenNum,
     mode: state.mode,

package/es/ScreenPlayer/LiveTools.d.ts

@@ -10,6 +10,8 @@ interface IToolsProps {
     screenNum: number;
     mode: PlayModeType;
     getPlayerItem: () => ExportPlayerType | undefined;
+    fit?: string;
+    toggleFit?: () => void;
 }
-declare function LiveTools({ containerRef, updateState, screenNum, getPlayerItem, mode }: IToolsProps): JSX.Element;
+declare function LiveTools({ containerRef, updateState, screenNum, getPlayerItem, mode, toggleFit, fit }: IToolsProps): JSX.Element;
 export default LiveTools;

package/es/ScreenPlayer/LiveTools.js

@@ -1,3 +1,4 @@
+import _useUpdate from "ahooks/es/useUpdate";
 import _useFullscreen3 from "ahooks/es/useFullscreen";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -13,29 +14,37 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React from 'react';
-import { ScreenType } from './utils';
+import IconFont from '../Player/iconfont';
+import ScreenSelect from './ScreenSelect';
 
 function LiveTools(_ref) {
   var containerRef = _ref.containerRef,
       updateState = _ref.updateState,
       screenNum = _ref.screenNum,
       getPlayerItem = _ref.getPlayerItem,
-      mode = _ref.mode;
+      mode = _ref.mode,
+      toggleFit = _ref.toggleFit,
+      fit = _ref.fit;
 
   var _useFullscreen = _useFullscreen3(containerRef),
       _useFullscreen2 = _slicedToArray(_useFullscreen, 2),
       isFullscreen = _useFullscreen2[0],
-      toggleFullscreen = _useFullscreen2[1].toggleFullscreen; // 播放状态控制
+      toggleFullscreen = _useFullscreen2[1].toggleFullscreen;
+
+  var update = _useUpdate(); // 播放状态控制
 
 
   var playToggle = function playToggle() {
-    var player = getPlayerItem();
+    var player = getPlayerItem(); // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+
     player ? player.video.paused ? player.api.play() : player.api.pause() : undefined;
+    update();
   }; // 重连
 
 
   var reload = function reload() {
-    var player = getPlayerItem();
+    var player = getPlayerItem(); // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+
     player ? player.reload ? player.reload() : player.api.reload() : undefined;
   };
 
@@ -44,52 +53,83 @@ function LiveTools(_ref) {
     return player ? player.api.snapshot() : undefined;
   };
 
+  var player = getPlayerItem();
   return /*#__PURE__*/React.createElement("div", {
     className: "player-tools"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "split-num"
-  }, ScreenType.map(function (item) {
-    return /*#__PURE__*/React.createElement("span", {
-      key: "".concat(item.name),
-      style: {
-        padding: 6
-      },
-      onClick: function onClick() {
-        return updateState({
-          screenNum: item.name
-        });
-      }
-    }, item.name);
-  }), /*#__PURE__*/React.createElement("span", {
-    style: {
-      padding: 6
-    },
-    onClick: toggleFullscreen
-  }, isFullscreen ? '退出' : '全屏'), /*#__PURE__*/React.createElement("span", {
-    style: {
-      padding: 6
-    },
+    className: "player-tools-left"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "player-tools-item"
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "lm-player-volume-close",
+    title: "\u97F3\u91CF"
+  })), /*#__PURE__*/React.createElement("span", {
+    className: "player-tools-item"
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "lm-player-xiangji1fill",
+    title: "\u622A\u56FE",
+    onClick: snapshot
+  })), /*#__PURE__*/React.createElement("span", {
+    className: "player-tools-item",
+    onClick: reload
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "lm-player-Refresh_Main",
+    title: "\u91CD\u8F7D"
+  })), /*#__PURE__*/React.createElement("span", {
+    className: "player-tools-item"
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "lm-player-YesorNo_No_Dark",
+    title: "\u5173\u95ED\u5F53\u524D"
+  }))), /*#__PURE__*/React.createElement("div", {
+    className: "player-tools-mid"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "player-tools-item",
+    onClick: playToggle
+  }, player && !player.video.paused ? /*#__PURE__*/React.createElement(IconFont, {
+    type: "lm-player-Pause_Main",
+    title: "\u6682\u505C"
+  }) : /*#__PURE__*/React.createElement(IconFont, {
+    type: "lm-player-Play_Main",
+    title: "\u64AD\u653E"
+  }))), /*#__PURE__*/React.createElement("div", {
+    className: "player-tools-right"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "player-tools-item"
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "lm-player-YesorNo_No_Dark",
+    title: "\u5173\u95ED\u6240\u6709"
+  })), /*#__PURE__*/React.createElement("span", {
+    className: "player-tools-item",
     onClick: function onClick() {
       return updateState({
         mode: mode === 1 ? 2 : 1
       });
     }
-  }, "\u5207\u6362", mode === 1 ? '插件' : '浏览器', "\u6A21\u5F0F"), /*#__PURE__*/React.createElement("span", {
-    style: {
-      padding: 6
-    },
-    onClick: playToggle
-  }, "\u64AD\u653E/\u6682\u505C"), /*#__PURE__*/React.createElement("span", {
-    style: {
-      padding: 6
-    },
-    onClick: reload
-  }, "\u91CD\u8FDE"), /*#__PURE__*/React.createElement("span", {
-    style: {
-      padding: 6
-    },
-    onClick: snapshot
-  }, "\u622A\u56FE")));
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "lm-player-YesorNo_No_Dark",
+    title: "\u5207\u6362".concat(mode === 1 ? '插件' : '浏览器', "\u6A21\u5F0F")
+  })), /*#__PURE__*/React.createElement("span", {
+    className: "player-tools-item",
+    onClick: toggleFit
+  }, fit === 'fill' ? /*#__PURE__*/React.createElement(IconFont, {
+    type: "lm-player-S_View_ScreenSizeFull",
+    title: "\u81EA\u9002\u5E94"
+  }) : /*#__PURE__*/React.createElement(IconFont, {
+    type: "lm-player-S_View_ScreenSizeFull",
+    title: "\u586B\u5145"
+  })), /*#__PURE__*/React.createElement(ScreenSelect, {
+    screenNum: screenNum,
+    updateState: updateState
+  }), /*#__PURE__*/React.createElement("span", {
+    className: "player-tools-item",
+    onClick: toggleFullscreen
+  }, isFullscreen ? /*#__PURE__*/React.createElement(IconFont, {
+    type: "lm-player-ExitFull_Main",
+    title: "\u5168\u5C4F"
+  }) : /*#__PURE__*/React.createElement(IconFont, {
+    type: "lm-player-Full_Main",
+    title: "\u5168\u5C4F"
+  }))));
 }
 
 export default LiveTools;

package/es/ScreenPlayer/PlayerWithExt.js

@@ -1,3 +1,5 @@
+import _useFullscreen3 from "ahooks/es/useFullscreen";
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -16,7 +18,10 @@ import LivePlayer from '../Player/single_player';
 import SegmentPlayer from '../Player/segment_player';
 import FrontendPlayer from '../Player/frontend_player';
 import ExtModel from '../PlayerExt';
+import moment from 'moment';
 export function LivePlayerWithExt(_a) {
+  var _b;
+
   var mode = _a.mode,
       isLive = _a.isLive,
       url = _a.url,
@@ -32,10 +37,16 @@ export function LivePlayerWithExt(_a) {
   var update = useCallback(function () {
     return updatePlayer(ref);
   }, [updatePlayer]);
+
+  var _useFullscreen = _useFullscreen3((_b = ref.current) === null || _b === void 0 ? void 0 : _b.container),
+      _useFullscreen2 = _slicedToArray(_useFullscreen, 2),
+      toggleFullscreen = _useFullscreen2[1].toggleFullscreen;
+
   return /*#__PURE__*/React.createElement("div", {
     className: "player-with-ext-layout ".concat(className),
     style: style,
-    onClick: onClick
+    onClick: onClick,
+    onDoubleClick: toggleFullscreen
   }, /*#__PURE__*/React.createElement(ExtModel, {
     url: url,
     mode: mode,
@@ -50,6 +61,8 @@ export function LivePlayerWithExt(_a) {
   }))));
 }
 export function SegmentPlayerWithExt(_a) {
+  var _b;
+
   var begin = _a.begin,
       style = _a.style,
       className = _a.className,
@@ -62,10 +75,16 @@ export function SegmentPlayerWithExt(_a) {
   var update = useCallback(function () {
     return updatePlayer(ref);
   }, [updatePlayer]);
+
+  var _useFullscreen4 = _useFullscreen3((_b = ref.current) === null || _b === void 0 ? void 0 : _b.container),
+      _useFullscreen5 = _slicedToArray(_useFullscreen4, 2),
+      toggleFullscreen = _useFullscreen5[1].toggleFullscreen;
+
   return /*#__PURE__*/React.createElement("div", {
     className: "player-with-ext-layout ".concat(className),
     style: style,
-    onClick: onClick
+    onClick: onClick,
+    onDoubleClick: toggleFullscreen
   }, /*#__PURE__*/React.createElement(ExtModel, {
     segments: segments,
     mode: 1
@@ -89,6 +108,8 @@ export function FrontendPlayerWithExt(_ref) {
       onClick = _ref.onClick,
       pluginDownloadUrl = _ref.pluginDownloadUrl;
 
+  var _a;
+
   var _useState = useState({
     begin: 0,
     end: 0,
@@ -107,7 +128,8 @@ export function FrontendPlayerWithExt(_ref) {
         begin = _ref2[0],
         end = _ref2[1];
     var videoUrl = new URL(segments[0].url);
-    videoUrl.searchParams.set('begin', "".concat(begin));
+    videoUrl.searchParams.set('begin', "".concat(moment(begin).unix()));
+    videoUrl.searchParams.set('end', "".concat(moment(end).unix()));
     setState({
       begin: begin,
       end: end,
@@ -119,22 +141,31 @@ export function FrontendPlayerWithExt(_ref) {
       return;
     }
 
+    var endTime = moment(segments[segments.length - 1].endTime).unix();
+    var beginTime = moment(time).unix();
     var videoUrl = new URL(state.url);
-    videoUrl.searchParams.set('begin', "".concat(time));
+    videoUrl.searchParams.set('begin', "".concat(beginTime));
+    videoUrl.searchParams.set('end', "".concat(endTime));
     setState(function (old) {
       return Object.assign(Object.assign({}, old), {
         url: videoUrl.toString()
       });
     });
-  }, [state.url]);
+  }, [segments, state.url]);
   var ref = useRef();
   var update = useCallback(function () {
     return updatePlayer(ref);
   }, [updatePlayer]);
+
+  var _useFullscreen6 = _useFullscreen3((_a = ref.current) === null || _a === void 0 ? void 0 : _a.container),
+      _useFullscreen7 = _slicedToArray(_useFullscreen6, 2),
+      toggleFullscreen = _useFullscreen7[1].toggleFullscreen;
+
   return /*#__PURE__*/React.createElement("div", {
     className: "player-with-ext-layout ".concat(className),
     style: style,
-    onClick: onClick
+    onClick: onClick,
+    onDoubleClick: toggleFullscreen
   }, /*#__PURE__*/React.createElement(ExtModel, {
     segments: segments,
     mode: mode,

package/es/ScreenPlayer/Record.d.ts

@@ -1,5 +1,10 @@
 /// <reference types="react" />
 import type { IRecordPlayerProps } from './interface';
 import './index.less';
+/**
+ * @desc 录像设计的时间全部需要到毫秒
+ * @param param0
+ * @returns
+ */
 declare function RecordPlayer({ list, children, queryRecord, onIndexChange }: IRecordPlayerProps): JSX.Element;
 export default RecordPlayer;

package/es/ScreenPlayer/Record.js

@@ -1,6 +1,5 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
-import _nextTick from "@cloud-app-dev/utils/es/nextTick";
 import _usePrevious from "ahooks/es/usePrevious";
 
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
@@ -34,6 +33,11 @@ import SegmentTimeLine from './SegmentTimeLine';
 import useRecordList from './useRecordList';
 import useVideoFit from './useVideoFit';
 import "./index.css";
+/**
+ * @desc 录像设计的时间全部需要到毫秒
+ * @param param0
+ * @returns
+ */
 
 function RecordPlayer(_ref) {
   var _this = this;
@@ -176,20 +180,8 @@ function RecordPlayer(_ref) {
         seekTo: 0
       });
     });
-    var play = getPlayerItem(); // 前端录像seek 处理
-
-    if (segmentItem.recordType === 2) {
-      play.api.seekTo(Math.round(state.seekTo / 1000));
-    } else {
-      // 云录像seek处理
-      var seekTime = state.seekTo - item.segments[index].beginTime;
-      play.api.setIndex(index);
-
-      _nextTick(function () {
-        return play.api.seekTo(seekTime / 1000);
-      });
-    } // eslint-disable-next-line react-hooks/exhaustive-deps
-
+    var play = getPlayerItem();
+    play.api.seekTo(state.seekTo); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [state.seekTo, state.selectIndex, recordList, segmentItem.recordType]); // 更新状态
 
   var updateState = function updateState(newState) {
@@ -286,9 +278,17 @@ function RecordPlayer(_ref) {
       }, _callee);
     }));
   }, // eslint-disable-next-line react-hooks/exhaustive-deps
-  [segmentItem.cid, segmentItem.recordType, segmentItem.segments, state.loading]); // index变化同步到父组件
+  [segmentItem.cid, segmentItem.recordType, segmentItem.segments, state.loading]);
+
+  var _updatePlayer = function updatePlayer(player, index) {
+    playerRef.current[index] = player;
+    setState(function (old) {
+      return Object.assign({}, old);
+    });
+  }; // index变化同步到父组件
   // eslint-disable-next-line react-hooks/exhaustive-deps
 
+
   useEffect(function () {
     return onIndexChange(state.selectIndex);
   }, [state.selectIndex]);
@@ -305,7 +305,7 @@ function RecordPlayer(_ref) {
       key: "".concat((_b = item === null || item === void 0 ? void 0 : item.date) !== null && _b !== void 0 ? _b : '', "-").concat((_c = item.cid) !== null && _c !== void 0 ? _c : '', "-").concat(index),
       className: state.selectIndex === index ? 'player-current-index' : '',
       updatePlayer: function updatePlayer(player) {
-        return playerRef.current[index] = player;
+        return _updatePlayer(player, index);
       },
       onClick: function onClick() {
         return setState(function (old) {
@@ -322,7 +322,7 @@ function RecordPlayer(_ref) {
       className: state.selectIndex === index ? 'player-current-index' : '',
       segments: ((_d = recordList[index]) === null || _d === void 0 ? void 0 : _d.segments) || [],
       updatePlayer: function updatePlayer(player) {
-        return playerRef.current[index] = player;
+        return _updatePlayer(player, index);
       },
       onClick: function onClick() {
         return setState(function (old) {
@@ -339,13 +339,15 @@ function RecordPlayer(_ref) {
       }
     }));
   })), /*#__PURE__*/React.createElement(RecordTools, {
+    time: state.currentTimes[state.selectIndex],
     fit: fit,
     toggleFit: toggleFit,
     getPlayerItem: getPlayerItem,
     screenNum: state.screenNum,
     mode: state.mode,
     containerRef: domRef,
-    updateState: updateState
+    updateState: updateState,
+    onTimeChange: onTimeChange
   }), /*#__PURE__*/React.createElement(SegmentTimeLine, {
     disabled: !!segmentItem.cid,
     begin: timeBegin,

package/es/ScreenPlayer/RecordTools.d.ts

@@ -12,6 +12,8 @@ interface IToolsProps {
     getPlayerItem: () => ExportPlayerType | undefined;
     fit?: string;
     toggleFit?: () => void;
+    time?: number;
+    onTimeChange?: (time: number) => void;
 }
-declare function RecordTools({ containerRef, updateState, screenNum, getPlayerItem, mode, fit, toggleFit }: IToolsProps): JSX.Element;
+declare function RecordTools({ containerRef, updateState, screenNum, getPlayerItem, mode, toggleFit, fit, time, onTimeChange }: IToolsProps): JSX.Element;
 export default RecordTools;