@cloud-app-dev/vidc 3.1.20 → 3.1.22

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) {
@@ -124,12 +122,12 @@ function LivePlayer(_a) {
     className: "player-layout",
     ref: domRef
   }, screenList.map(function (item, index) {
-    var _a;
+    var _a, _b;
     return /*#__PURE__*/React.createElement(LivePlayerWithExt, Object.assign({}, item, {
-      mode: (_a = state.modes[index]) !== null && _a !== void 0 ? _a : item.mode,
-      key: "".concat(item.url, "-").concat(index),
+      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/Record.js

@@ -4,11 +4,11 @@ import "antd/lib/message/style";
 import _message from "antd/lib/message";
 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; }
-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 _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 _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); }
@@ -24,18 +24,18 @@ import SegmentTimeLine from './SegmentTimeLine';
 import useRecordList from './useRecordList';
 import useVideoFit from './useVideoFit';
 import DisableMark from '../DisableMark';
-import "./index.css";
 import { cloneDeep } from 'lodash-es';
+import "./index.css";
 var defaultState = {
   screenNum: 4,
   selectIndex: 0,
-  modes: [],
-  currentTimes: [],
+  modes: {},
+  currentTimes: {},
   loading: false,
   seekTo: 0,
   mergeSegments: [],
   timeMode: 24,
-  winLoadingStatus: []
+  winLoadingStatus: {}
 };
 /**
  * @desc 录像设计的时间全部需要到毫秒
@@ -80,6 +80,7 @@ function RecordPlayer(_a) {
       return v.name === screenNum;
     });
   }, [screenNum]);
+  // 填充数据扩充list.length
   var screenList = useMemo(function () {
     return mergeFill(screenNum, list, {
       recordType: 1
@@ -101,8 +102,9 @@ function RecordPlayer(_a) {
     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;
+        var item = old.mergeSegments[idx];
+        var status = Object.assign({}, old.winLoadingStatus);
+        status["".concat(item.cid, "-").concat(item.date)] = loadding;
         return Object.assign(Object.assign({}, old), {
           winLoadingStatus: status
         });
@@ -110,11 +112,12 @@ function RecordPlayer(_a) {
     }
   });
   // 缓存所有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 = 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 segmentItem = useMemo(function () {
@@ -124,8 +127,12 @@ function RecordPlayer(_a) {
     return segmentItem.date;
   }, [segmentItem.date]);
   var currentTime = useMemo(function () {
-    return state.currentTimes[state.selectIndex];
-  }, [state.currentTimes, state.selectIndex]);
+    var item = state.mergeSegments[state.selectIndex];
+    if (!item) {
+      return undefined;
+    }
+    return state.currentTimes["".concat(item.cid, "-").concat(item.date)];
+  }, [state.currentTimes, state.mergeSegments, state.selectIndex]);
   /**
    * @desc 用户缓存接收list的变化。
    */
@@ -160,7 +167,7 @@ function RecordPlayer(_a) {
             mergeList[i].cid = item.cid;
             mergeList[i].recordType = item.recordType;
             // 更新变化的currentTime
-            times[i] = list[i].date;
+            times["".concat(item.cid, "-").concat(item.date)] = list[i].date;
           }
         }
       } catch (err) {
@@ -170,7 +177,7 @@ function RecordPlayer(_a) {
       }
       return Object.assign(Object.assign({}, old), {
         mergeSegments: _toConsumableArray(mergeList),
-        currentTimes: _toConsumableArray(times)
+        currentTimes: Object.assign({}, times)
       });
     });
   }, [list, listKey, prevListKey]);
@@ -214,8 +221,9 @@ function RecordPlayer(_a) {
       }
     }
     if (newState.hasOwnProperty('mode')) {
-      var newModes = _toConsumableArray(state.modes);
-      newModes[state.selectIndex] = newState.mode;
+      var item = state.mergeSegments[state.selectIndex];
+      var newModes = Object.assign({}, state.modes);
+      newModes["".concat(item.cid, "-").concat(item.date)] = newState.mode;
       obj.modes = newModes;
     }
     if (newState.hasOwnProperty('timeMode')) {
@@ -286,8 +294,9 @@ function RecordPlayer(_a) {
                   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 = mergeSegments[old.selectIndex];
+                currentTimes["".concat(item.cid, "-").concat(item.date)] = time;
                 return Object.assign(Object.assign({}, old), {
                   currentTimes: currentTimes,
                   mergeSegments: mergeSegments,
@@ -306,7 +315,8 @@ function RecordPlayer(_a) {
   // eslint-disable-next-line react-hooks/exhaustive-deps
   [segmentItem.cid, segmentItem.recordType, segmentItem.segments, state.loading]);
   var _updatePlayer = function updatePlayer(player, index) {
-    playerRef.current[index] = player;
+    var item = state.mergeSegments[index];
+    playerRef.current["".concat(item.cid, "-").concat(item.date)] = player;
     setState(function (old) {
       return Object.assign({}, old);
     });
@@ -344,10 +354,10 @@ function RecordPlayer(_a) {
     className: "player-layout",
     ref: domRef
   }, screenList.map(function (item, index) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d;
     return item.recordType === 1 ? /*#__PURE__*/React.createElement(SegmentPlayerWithExt, Object.assign({}, item, {
       segments: ((_a = recordList[index]) === null || _a === void 0 ? void 0 : _a.segments) || [],
-      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),
+      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) {
         return _updatePlayer(player, index);
@@ -363,13 +373,13 @@ function RecordPlayer(_a) {
         width: screenType.width,
         height: screenType.height
       },
-      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,
       fps: fps,
       fpsDelay: fpsDelay,
-      httpLoading: state.winLoadingStatus[index]
+      httpLoading: state.winLoadingStatus["".concat(item === null || item === void 0 ? void 0 : item.date, "-").concat(item.cid)]
     })) : /*#__PURE__*/React.createElement(FrontendPlayerWithExt, Object.assign({}, item, {
       className: state.selectIndex === index ? 'player-current-index' : '',
-      segments: ((_e = recordList[index]) === null || _e === void 0 ? void 0 : _e.segments) || [],
+      segments: ((_c = recordList[index]) === null || _c === void 0 ? void 0 : _c.segments) || [],
       updatePlayer: function updatePlayer(player) {
         return _updatePlayer(player, index);
       },
@@ -380,13 +390,13 @@ function RecordPlayer(_a) {
           });
         });
       },
-      mode: (_f = state.modes[index]) !== null && _f !== void 0 ? _f : item.mode,
-      key: "".concat((_g = item === null || item === void 0 ? void 0 : item.date) !== null && _g !== void 0 ? _g : '', "-").concat((_h = item.cid) !== null && _h !== void 0 ? _h : '', "-").concat(index),
+      mode: (_d = state.modes["".concat(item === null || item === void 0 ? void 0 : item.date, "-").concat(item.cid)]) !== null && _d !== void 0 ? _d : 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: state.winLoadingStatus["".concat(item === null || item === void 0 ? void 0 : item.date, "-").concat(item.cid)],
       getLocalRecordUrl: getLocalRecordUrl,
       pluginDownloadUrl: pluginDownloadUrl
     }));
@@ -396,7 +406,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/interface.d.ts

@@ -1,6 +1,6 @@
-import React from 'react';
-import { PlayModeType } from '../PlayerExt';
-import { ISegmentType } from '../Player/player';
+import type React from 'react';
+import type { PlayModeType } from '../PlayerExt';
+import type { ISegmentType,ExportPlayerType } from '../Player/player';
 
 export type RecordItem = {
   type?: 'flv' | 'hls' | 'native';
@@ -105,12 +105,12 @@ export interface IRecordPlayerState {
   /**
    * 插件OR浏览器
    */
-  modes: PlayModeType[];
+  modes: {[key:string]:PlayModeType};
 
   /**
    * 时间轴开始时间
    */
-  currentTimes: number[];
+  currentTimes: {[key:string]:number};
 
   /**
    * 需要seek的时间针对当前窗口，为0时忽略
@@ -135,7 +135,7 @@ export interface IRecordPlayerState {
   /**
    * 窗口播放状态
    */
-  winLoadingStatus: boolean[];
+  winLoadingStatus: {[key:string]:boolean};
 }
 
 export type ScreenItemLivePlayerType = {
@@ -205,7 +205,9 @@ export interface ILivePlayerProps {
 export interface ILivePlayerState {
   screenNum: number;
   selectIndex: number;
-  modes: PlayModeType[];
+  modes: {[key:string]:PlayModeType};
 }
 
 export const RecordPlayer: React.FC<IRecordPlayerProps>;
+
+export type PlayItemMapType = { [key: string]: React.MutableRefObject<ExportPlayerType> };

package/package.json

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