@cloud-app-dev/vidc 3.1.21 → 3.2.1

package/.umirc.ts

@@ -35,9 +35,6 @@ export default defineConfig({
     '/api': {
       target: 'https://jxsr-eye.antelopecloud.cn/',
       changeOrigin: true,
-      onProxyReq(proxyReq: any) {
-        proxyReq.setHeader('authorization', token);
-      },
     },
   },
   mfsu:

package/es/PlayerExt/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { ISegmentType } from 'src/Player/player';
 import './index.less';
 export declare type PlayModeType = 1 | 2;
 export interface IPluginProps {
@@ -18,6 +19,7 @@ export interface IPluginProps {
      * @default ''
      */
     pluginParams?: string;
+    segments?: ISegmentType[];
     /**
      * 正在获取视频数据
      */
@@ -42,5 +44,5 @@ export declare function getLocalPlayPath(url: string, params?: string): string;
 export declare function usePlugin(mode: PlayModeType, key: any): {
     needInstall: boolean;
 };
-export declare function ExtModel({ url, children, mode, pluginDownloadUrl, pluginParams, loading }: IPluginProps): JSX.Element;
+export declare function ExtModel({ url, children, mode, pluginDownloadUrl, pluginParams, loading, segments }: IPluginProps): JSX.Element;
 export { ExtModel as default };

package/es/PlayerExt/index.js

@@ -122,7 +122,8 @@ export function ExtModel(_ref2) {
     mode = _ref2.mode,
     pluginDownloadUrl = _ref2.pluginDownloadUrl,
     pluginParams = _ref2.pluginParams,
-    loading = _ref2.loading;
+    loading = _ref2.loading,
+    segments = _ref2.segments;
   var _useState3 = useState({
       forceKey: Date.now()
     }),
@@ -130,14 +131,24 @@ export function ExtModel(_ref2) {
     state = _useState4[0],
     setState = _useState4[1];
   var hasUrl = useMemo(function () {
-    return !!url;
-  }, [url]);
+    return !!url || Array.isArray(segments) && segments.findIndex(function (v) {
+      return v.url;
+    }) > -1;
+  }, [segments, url]);
   var _usePlugin = usePlugin(mode, state.forceKey),
     needInstall = _usePlugin.needInstall;
   // eslint-disable-next-line react-hooks/exhaustive-deps
   var playUrl = useMemo(function () {
     return mode === 2 && url ? getLocalPlayPath(url, pluginParams) : url;
   }, [url, mode]);
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  var playSegments = useMemo(function () {
+    return mode === 2 && url ? segments.map(function (v) {
+      return Object.assign(Object.assign({}, v), {
+        url: getLocalPlayPath(v.url, pluginParams)
+      });
+    }) : url;
+  }, [segments, mode]);
   if (needInstall) {
     return /*#__PURE__*/React.createElement(NeedInstallPlugin, {
       pluginDownloadUrl: pluginDownloadUrl,
@@ -158,8 +169,9 @@ export function ExtModel(_ref2) {
   }
   return /*#__PURE__*/React.createElement("div", {
     className: "lm-player-ext-layout"
-  }, /*#__PURE__*/React.cloneElement(children, {
-    url: playUrl
-  }));
+  }, /*#__PURE__*/React.cloneElement(children, mode === 2 ? {
+    url: playUrl,
+    segments: playSegments
+  } : {}));
 }
 export { ExtModel as default };

package/es/ScreenPlayer/Live.js

@@ -1,8 +1,4 @@
 import _useUpdateEffect from "ahooks/es/useUpdateEffect";
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -34,7 +30,7 @@ function LivePlayer(_a) {
   var _useState = useState({
       screenNum: defaultScreen !== null && defaultScreen !== void 0 ? defaultScreen : 4,
       selectIndex: defaultSelectIndex !== null && defaultSelectIndex !== void 0 ? defaultSelectIndex : 0,
-      modes: []
+      modes: {}
     }),
     _useState2 = _slicedToArray(_useState, 2),
     state = _useState2[0],
@@ -49,7 +45,7 @@ function LivePlayer(_a) {
     return (_a = options.screenNum) !== null && _a !== void 0 ? _a : state.screenNum;
   }, [options.screenNum, state.screenNum]);
   // 缓存所有player对象
-  var playerRef = useRef([]);
+  var playerRef = useRef({});
   var screenType = useMemo(function () {
     return ScreenType.find(function (v) {
       return v.name === screenNum;
@@ -60,8 +56,9 @@ function LivePlayer(_a) {
   }, [list, screenNum]);
   // 获取选中player对象
   var getPlayerItem = function getPlayerItem() {
-    var _a;
-    return (_a = playerRef.current[state.selectIndex]) === null || _a === void 0 ? void 0 : _a.current;
+    var _a, _b;
+    var item = list[state.selectIndex];
+    return (_b = (_a = playerRef.current) === null || _a === void 0 ? void 0 : _a[item === null || item === void 0 ? void 0 : item.cid]) === null || _b === void 0 ? void 0 : _b.current;
   };
   // 更新状态
   var updateState = function updateState(newState) {
@@ -79,8 +76,9 @@ function LivePlayer(_a) {
       }
     }
     if (newState.hasOwnProperty('mode')) {
-      var newModes = _toConsumableArray(state.modes);
-      newModes[state.selectIndex] = newState.mode;
+      var item = list[state.selectIndex];
+      var newModes = Object.assign({}, state.modes);
+      newModes[item.cid] = newState.mode;
       obj.modes = newModes;
     }
     setState(function (old) {
@@ -126,10 +124,10 @@ function LivePlayer(_a) {
   }, screenList.map(function (item, index) {
     var _a, _b;
     return /*#__PURE__*/React.createElement(LivePlayerWithExt, Object.assign({}, item, {
-      mode: (_a = state.modes[index]) !== null && _a !== void 0 ? _a : item.mode,
+      mode: (_a = state.modes[item.cid]) !== null && _a !== void 0 ? _a : item.mode,
       key: (_b = item.url) !== null && _b !== void 0 ? _b : "".concat(index),
       updatePlayer: function updatePlayer(player) {
-        return playerRef.current[index] = player;
+        return playerRef.current[item.cid] = player;
       },
       className: state.selectIndex === index ? 'player-current-index' : '',
       onClick: index !== state.selectIndex ? function () {

package/es/ScreenPlayer/PlayerWithExt.js

@@ -82,7 +82,8 @@ export function SegmentPlayerWithExt(_a) {
     onDoubleClick: toggleFullscreen
   }, /*#__PURE__*/React.createElement(ExtModel, {
     mode: 1,
-    loading: httpLoading
+    loading: httpLoading,
+    segments: segments
   }, /*#__PURE__*/React.createElement(SegmentPlayer, Object.assign({}, props, {
     segments: segments,
     type: "hls",

package/es/ScreenPlayer/RatePick.js

@@ -16,6 +16,12 @@ function RatePick(_ref) {
     onChange: onChange,
     placement: "topLeft"
   }, /*#__PURE__*/React.createElement(_Select.Option, {
+    value: 8
+  }, "x8"), /*#__PURE__*/React.createElement(_Select.Option, {
+    value: 6
+  }, "x6"), /*#__PURE__*/React.createElement(_Select.Option, {
+    value: 4
+  }, "x4"), /*#__PURE__*/React.createElement(_Select.Option, {
     value: 2
   }, "x2"), /*#__PURE__*/React.createElement(_Select.Option, {
     value: 1.5

package/es/ScreenPlayer/Record.d.ts

@@ -6,5 +6,5 @@ import './index.less';
  * @param param0
  * @returns
  */
-declare function RecordPlayer({ list, children, queryRecord, onIndexChange, onClose, onCloseAll, download, snapshot, defaultScreen, screenChange, defaultSelectIndex, oneWinExtTools, allWinExtTools, fpsDelay, fps, queryRecordErrorHandle, getLocalRecordUrl, pluginDownloadUrl, ...options }: IRecordPlayerProps): JSX.Element;
+declare function RecordPlayer({ list, children, queryRecord, onIndexChange, onClose, onCloseAll, download, snapshot, defaultScreen, screenChange, defaultSelectIndex, oneWinExtTools, allWinExtTools, fpsDelay, fps, queryRecordErrorHandle, getLocalRecordUrl, pluginDownloadUrl, onTimeLineChange, seekLoading, ...options }: IRecordPlayerProps): JSX.Element;
 export default RecordPlayer;

package/es/ScreenPlayer/Record.js

@@ -1,14 +1,7 @@
 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 _useUpdateEffect from "ahooks/es/useUpdateEffect";
-import "antd/lib/message/style";
-import _message from "antd/lib/message";
-import _usePrevious from "ahooks/es/usePrevious";
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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; }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -17,11 +10,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { __awaiter, __rest } from "tslib";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { ScreenType, mergeFill, differenceWithIndexs, FILTER_KEY } from './utils';
+import { ScreenType, mergeFill, sleep } from './utils';
 import { SegmentPlayerWithExt, FrontendPlayerWithExt } from './PlayerWithExt';
 import RecordTools from './RecordTools';
 import SegmentTimeLine from './SegmentTimeLine';
-import useRecordList from './useRecordList';
 import useVideoFit from './useVideoFit';
 import DisableMark from '../DisableMark';
 import { cloneDeep } from 'lodash-es';
@@ -29,13 +21,10 @@ import "./index.css";
 var defaultState = {
   screenNum: 4,
   selectIndex: 0,
-  modes: [],
-  currentTimes: [],
-  loading: false,
-  seekTo: 0,
-  mergeSegments: [],
-  timeMode: 24,
-  winLoadingStatus: []
+  modes: {},
+  currentTimes: {},
+  seekTo: {},
+  timeMode: 24
 };
 /**
  * @desc 录像设计的时间全部需要到毫秒
@@ -62,7 +51,9 @@ function RecordPlayer(_a) {
     queryRecordErrorHandle = _a.queryRecordErrorHandle,
     getLocalRecordUrl = _a.getLocalRecordUrl,
     pluginDownloadUrl = _a.pluginDownloadUrl,
-    options = __rest(_a, ["list", "children", "queryRecord", "onIndexChange", "onClose", "onCloseAll", "download", "snapshot", "defaultScreen", "screenChange", "defaultSelectIndex", "oneWinExtTools", "allWinExtTools", "fpsDelay", "fps", "queryRecordErrorHandle", "getLocalRecordUrl", "pluginDownloadUrl"]);
+    onTimeLineChange = _a.onTimeLineChange,
+    seekLoading = _a.seekLoading,
+    options = __rest(_a, ["list", "children", "queryRecord", "onIndexChange", "onClose", "onCloseAll", "download", "snapshot", "defaultScreen", "screenChange", "defaultSelectIndex", "oneWinExtTools", "allWinExtTools", "fpsDelay", "fps", "queryRecordErrorHandle", "getLocalRecordUrl", "pluginDownloadUrl", "onTimeLineChange", "seekLoading"]);
   var _useState = useState(Object.assign(Object.assign({}, cloneDeep(defaultState)), {
       screenNum: defaultScreen !== null && defaultScreen !== void 0 ? defaultScreen : defaultState.screenNum
     })),
@@ -89,116 +80,99 @@ function RecordPlayer(_a) {
   var _useVideoFit = useVideoFit(domRef, []),
     fit = _useVideoFit.fit,
     toggleFit = _useVideoFit.toggleFit;
-  // key变化
-  var listKey = useMemo(function () {
-    return screenList.map(function (v) {
-      var _a, _b;
-      return v ? "".concat((_a = v.date) !== null && _a !== void 0 ? _a : 0, "|").concat((_b = v.cid) !== null && _b !== void 0 ? _b : 1) : FILTER_KEY;
-    }).join('-');
-  }, [screenList]);
-  var prevListKey = _usePrevious(listKey);
-  // 所有窗口播放信息
-  var recordList = useRecordList(state.mergeSegments, queryRecord, {
-    errorCallback: queryRecordErrorHandle !== null && queryRecordErrorHandle !== void 0 ? queryRecordErrorHandle : function () {},
-    loaddingCallback: function loaddingCallback(idx, loadding) {
-      return setState(function (old) {
-        var status = _toConsumableArray(old.winLoadingStatus);
-        status[idx] = loadding;
-        return Object.assign(Object.assign({}, old), {
-          winLoadingStatus: status
-        });
-      });
-    }
-  });
   // 缓存所有player对象
-  var playerRef = useRef([]);
+  var playerRef = useRef({});
   // 获取选中player对象
   var getPlayerItem = function getPlayerItem() {
-    var _a;
-    return (_a = playerRef.current[state.selectIndex]) === null || _a === void 0 ? void 0 : _a.current;
+    var _a, _b;
+    var item = screenList[state.selectIndex];
+    return item ? (_b = (_a = playerRef.current) === null || _a === void 0 ? void 0 : _a["".concat(item.cid, "-").concat(item.date)]) === null || _b === void 0 ? void 0 : _b.current : null;
   };
   // 当前窗口信息
   var segmentItem = useMemo(function () {
-    return recordList[state.selectIndex] || {};
-  }, [state.selectIndex, recordList]);
+    return screenList[state.selectIndex] || {};
+  }, [state.selectIndex, screenList]);
   var timeBegin = useMemo(function () {
     return segmentItem.date;
   }, [segmentItem.date]);
   var currentTime = useMemo(function () {
-    return state.currentTimes[state.selectIndex];
-  }, [state.currentTimes, state.selectIndex]);
-  /**
-   * @desc 用户缓存接收list的变化。
-   */
-  useEffect(function () {
-    if (!prevListKey || !listKey) {
-      return;
+    var item = screenList[state.selectIndex];
+    if (!item) {
+      return undefined;
     }
-    var diffIndexs = differenceWithIndexs(listKey.split('-'), prevListKey.split('-'));
-    if (diffIndexs.length === 0) {
-      return;
-    }
-    setState(function (old) {
-      var mergeList = old.mergeSegments;
-      var times = old.currentTimes;
-      // 批量更新调整
-      var _iterator = _createForOfIteratorHelper(diffIndexs),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var dif = _step.value;
-          var i = dif.idx;
-          var item = list[i];
-          if (!item) {
-            // 可能是外部的关闭动作关闭
-            mergeList[i] = undefined;
-          } else {
-            if (!mergeList[i]) {
-              mergeList[i] = cloneDeep(item);
-            }
-            mergeList[i].date = item.date;
-            mergeList[i].segments = mergeList[i].cid !== item.cid ? [] : mergeList[i].segments;
-            mergeList[i].cid = item.cid;
-            mergeList[i].recordType = item.recordType;
-            // 更新变化的currentTime
-            times[i] = list[i].date;
-          }
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-      return Object.assign(Object.assign({}, old), {
-        mergeSegments: _toConsumableArray(mergeList),
-        currentTimes: _toConsumableArray(times)
-      });
-    });
-  }, [list, listKey, prevListKey]);
+    return state.currentTimes["".concat(item.cid, "-").concat(item.date)];
+  }, [state.currentTimes, screenList, state.selectIndex]);
   /**
    * @desc seek hook
    * 处理seek相关的包括索引和video current time
    */
   useEffect(function () {
-    if (state.seekTo === 0) {
+    var _a, _b;
+    // 寻找需要seek的item
+    var key = Object.keys(state.seekTo).find(function (k) {
+      return state.seekTo[k] !== 0;
+    });
+    if (!key) {
       return;
     }
-    var item = recordList[state.selectIndex];
-    var index = item.segments.findIndex(function (v) {
-      return state.seekTo >= v.beginTime && state.seekTo < v.endTime;
+    var seekTime = state.seekTo[key];
+    var item = list.find(function (v) {
+      return !!v && "".concat(v.cid, "-").concat(v.date) === key;
     });
+    var index = (_b = (_a = item === null || item === void 0 ? void 0 : item.segments) === null || _a === void 0 ? void 0 : _a.findIndex(function (v) {
+      return seekTime >= v.beginTime && seekTime < v.endTime;
+    })) !== null && _b !== void 0 ? _b : -1;
     if (index === -1) {
       return;
     }
-    setState(function (old) {
-      return Object.assign(Object.assign({}, old), {
-        seekTo: 0
+    // list变化导致ref被销毁，这里设计了一个处理机制，1s内重试5次，尝试获取新的ref，正常情况下都会获取到播放器初始化很快，还未获取到那么丢弃
+    var timer = 0;
+    function getPlay(mapkey) {
+      var _a;
+      return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var playRef;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                playRef = (_a = playerRef.current) === null || _a === void 0 ? void 0 : _a[mapkey];
+                if (!(playRef && playRef.current && playRef.current.api)) {
+                  _context.next = 5;
+                  break;
+                }
+                return _context.abrupt("return", playRef.current);
+              case 5:
+                if (!(timer < 5)) {
+                  _context.next = 10;
+                  break;
+                }
+                timer++;
+                _context.next = 9;
+                return sleep(200);
+              case 9:
+                return _context.abrupt("return", sleep(200).then(function () {
+                  return getPlay(mapkey);
+                }));
+              case 10:
+                return _context.abrupt("return", undefined);
+              case 11:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+    }
+    getPlay(key).then(function (play) {
+      play && play.api.seekTo(seekTime);
+      setState(function (old) {
+        return Object.assign(Object.assign({}, old), {
+          seekTo: Object.assign(Object.assign({}, old.seekTo), _defineProperty({}, key, 0))
+        });
       });
     });
-    var play = getPlayerItem();
-    play.api.seekTo(state.seekTo);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [state.seekTo, state.selectIndex, recordList, segmentItem.recordType]);
+  }, [state.seekTo, list]);
   // 更新状态
   var updateState = function updateState(newState) {
     var obj = {};
@@ -215,8 +189,9 @@ function RecordPlayer(_a) {
       }
     }
     if (newState.hasOwnProperty('mode')) {
-      var newModes = _toConsumableArray(state.modes);
-      newModes[state.selectIndex] = newState.mode;
+      var item = screenList[state.selectIndex];
+      var newModes = Object.assign({}, state.modes);
+      newModes["".concat(item.cid, "-").concat(item.date)] = newState.mode;
       obj.modes = newModes;
     }
     if (newState.hasOwnProperty('timeMode')) {
@@ -232,82 +207,63 @@ function RecordPlayer(_a) {
    * 2:不在片断内，查询新的片段，更新mergeSegments和seekTo后交给seek hook处理
    */
   var onTimeChange = useCallback(function (time, outTimeline) {
-    return __awaiter(_this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var index, segments;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
+    return __awaiter(_this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var index;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(!Array.isArray(segmentItem.segments) || state.loading)) {
-                _context.next = 2;
+              if (!(!Array.isArray(segmentItem.segments) || seekLoading)) {
+                _context2.next = 2;
                 break;
               }
-              return _context.abrupt("return");
+              return _context2.abrupt("return");
             case 2:
               if (!(outTimeline && segmentItem.recordType === 1)) {
-                _context.next = 5;
+                _context2.next = 5;
                 break;
               }
               // 云录像 若点击了缺失的片段，直接忽略
-              _message.warning('当前录像片段缺失！');
-              return _context.abrupt("return");
+              console.warn('当前录像片段缺失！');
+              return _context2.abrupt("return");
             case 5:
               if (!(time > Date.now())) {
-                _context.next = 8;
+                _context2.next = 8;
                 break;
               }
               console.warn('查询时间超出正常范围！');
-              return _context.abrupt("return");
+              return _context2.abrupt("return");
             case 8:
               index = segmentItem.segments.findIndex(function (v) {
                 return time >= v.beginTime && time < v.endTime;
               });
-              if (!(index === -1)) {
-                _context.next = 14;
-                break;
+              if (index === -1) {
+                // 触发回调
+                onTimeLineChange === null || onTimeLineChange === void 0 ? void 0 : onTimeLineChange(time);
               }
-              _context.next = 12;
-              return queryRecord({
-                cid: segmentItem.cid,
-                date: time,
-                recordType: segmentItem.recordType
-              });
-            case 12:
-              segments = _context.sent;
-              setState(function (old) {
-                return Object.assign(Object.assign({}, old), {
-                  loading: true
-                });
-              });
-            case 14:
               //更新time
               setState(function (old) {
-                var mergeSegments = old.mergeSegments;
-                if (segments) {
-                  mergeSegments[old.selectIndex].segments = segments;
-                  mergeSegments = _toConsumableArray(mergeSegments);
-                }
-                var currentTimes = _toConsumableArray(old.currentTimes);
-                currentTimes[old.selectIndex] = time;
+                var currentTimes = Object.assign({}, old.currentTimes);
+                var item = screenList[old.selectIndex];
+                currentTimes["".concat(item.cid, "-").concat(item.date)] = time;
                 return Object.assign(Object.assign({}, old), {
                   currentTimes: currentTimes,
-                  mergeSegments: mergeSegments,
-                  loading: false,
-                  seekTo: time
+                  seekTo: Object.assign(Object.assign({}, old.seekTo), _defineProperty({}, "".concat(item.cid, "-").concat(item.date), time))
                 });
               });
-            case 15:
+            case 11:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee);
+      }, _callee2);
     }));
   },
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  [segmentItem.cid, segmentItem.recordType, segmentItem.segments, state.loading]);
+  [segmentItem.cid, segmentItem.recordType, segmentItem.segments, seekLoading]);
   var _updatePlayer = function updatePlayer(player, index) {
-    playerRef.current[index] = player;
+    var item = screenList[index];
+    playerRef.current["".concat(item.cid, "-").concat(item.date)] = player;
     setState(function (old) {
       return Object.assign({}, old);
     });
@@ -345,9 +301,9 @@ function RecordPlayer(_a) {
     className: "player-layout",
     ref: domRef
   }, screenList.map(function (item, index) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     return item.recordType === 1 ? /*#__PURE__*/React.createElement(SegmentPlayerWithExt, Object.assign({}, item, {
-      segments: ((_a = recordList[index]) === null || _a === void 0 ? void 0 : _a.segments) || [],
+      segments: (item === null || item === void 0 ? void 0 : item.segments) || [],
       key: item.date && item.cid ? "".concat(item === null || item === void 0 ? void 0 : item.date, "-").concat(item.cid) : "".concat(index),
       className: state.selectIndex === index ? 'player-current-index' : '',
       updatePlayer: function updatePlayer(player) {
@@ -364,13 +320,13 @@ function RecordPlayer(_a) {
         width: screenType.width,
         height: screenType.height
       },
-      mode: (_b = state.modes[index]) !== null && _b !== void 0 ? _b : item.mode,
+      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: state.winLoadingStatus[index]
+      httpLoading: item.loading
     })) : /*#__PURE__*/React.createElement(FrontendPlayerWithExt, Object.assign({}, item, {
       className: state.selectIndex === index ? 'player-current-index' : '',
-      segments: ((_c = recordList[index]) === null || _c === void 0 ? void 0 : _c.segments) || [],
+      segments: (item === null || item === void 0 ? void 0 : item.segments) || [],
       updatePlayer: function updatePlayer(player) {
         return _updatePlayer(player, index);
       },
@@ -381,13 +337,13 @@ function RecordPlayer(_a) {
           });
         });
       },
-      mode: (_d = state.modes[index]) !== null && _d !== void 0 ? _d : item.mode,
+      mode: (_b = state.modes["".concat(item === null || item === void 0 ? void 0 : item.date, "-").concat(item.cid)]) !== null && _b !== void 0 ? _b : item.mode,
       key: item.date && item.cid ? "".concat(item === null || item === void 0 ? void 0 : item.date, "-").concat(item.cid) : "".concat(index),
       style: {
         width: screenType.width,
         height: screenType.height
       },
-      httpLoading: state.winLoadingStatus[index],
+      httpLoading: item.loading,
       getLocalRecordUrl: getLocalRecordUrl,
       pluginDownloadUrl: pluginDownloadUrl
     }));
@@ -397,7 +353,7 @@ function RecordPlayer(_a) {
     disabled: !segmentItem.cid,
     width: "70%"
   }, /*#__PURE__*/React.createElement(RecordTools, {
-    time: state.currentTimes[state.selectIndex],
+    time: state.currentTimes["".concat(segmentItem.cid, "-").concat(segmentItem.date)],
     fit: fit,
     toggleFit: toggleFit,
     getPlayerItem: getPlayerItem,

package/es/ScreenPlayer/RecordTools.js

@@ -34,7 +34,7 @@ function RecordTools(_ref) {
     snapshot = _ref.snapshot,
     oneWinExtTools = _ref.oneWinExtTools,
     allWinExtTools = _ref.allWinExtTools;
-  var _a;
+  var _a, _b, _c;
   var _useFullscreen = useFullscreen(containerRef),
     _useFullscreen2 = _slicedToArray(_useFullscreen, 2),
     isFullscreen = _useFullscreen2[0],
@@ -128,7 +128,7 @@ function RecordTools(_ref) {
     title: "\u9010\u5E27\u64AD\u653E"
   })), /*#__PURE__*/React.createElement(RatePick, {
     onChange: ratechange,
-    value: (_a = player === null || player === void 0 ? void 0 : player.video.playbackRate) !== null && _a !== void 0 ? _a : 1
+    value: (_b = (_a = player === null || player === void 0 ? void 0 : player.video) === null || _a === void 0 ? void 0 : _a.playbackRate) !== null && _b !== void 0 ? _b : 1
   }), oneWinExtTools), /*#__PURE__*/React.createElement("div", {
     className: "player-tools-mid"
   }, /*#__PURE__*/React.createElement("div", {
@@ -146,7 +146,7 @@ function RecordTools(_ref) {
   }), /*#__PURE__*/React.createElement("div", {
     className: "player-tools-item",
     onClick: playToggle
-  }, player && !player.video.paused ? /*#__PURE__*/React.createElement(IconFont, {
+  }, player && !((_c = player.video) === null || _c === void 0 ? void 0 : _c.paused) ? /*#__PURE__*/React.createElement(IconFont, {
     type: "lm-player-Pause_Main",
     title: "\u6682\u505C",
     style: {