@cloud-app-dev/vidc 3.0.5 → 3.0.8

package/es/DisableMark/index.css

@@ -0,0 +1,9 @@
+.disable-mark {
+  position: absolute;
+  cursor: not-allowed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  z-index: 999;
+}

package/es/DisableMark/index.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import './index.less';
+interface IDisableMarkProps {
+    children: React.ReactNode;
+    disabled: boolean;
+}
+export default function DisableMark({ children, disabled }: IDisableMarkProps): JSX.Element;
+export {};

package/es/DisableMark/index.js

@@ -0,0 +1,9 @@
+import React from 'react';
+import "./index.css";
+export default function DisableMark(_ref) {
+  var children = _ref.children,
+      disabled = _ref.disabled;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, disabled ? /*#__PURE__*/React.createElement("div", {
+    className: "disable-mark"
+  }) : null, children);
+}

package/es/Player/live_heart.js

@@ -1,28 +1,10 @@
-import _useUpdateEffect from "ahooks/es/useUpdateEffect";
-
-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); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-import React, { useEffect, useState } from 'react';
+import _useRafInterval from "ahooks/es/useRafInterval";
+import React, { useEffect } from 'react';
 import BrowserTab from './event/browserTabEvent';
 
 function LiveHeart(_ref) {
   var api = _ref.api;
 
-  var _useState = useState(Date.now()),
-      _useState2 = _slicedToArray(_useState, 2),
-      runDep = _useState2[0],
-      setRundep = _useState2[1];
-
   var run = function run() {
     var current = api.getCurrentTime();
     var buffered = api.getSecondsLoaded();
@@ -30,6 +12,7 @@ function LiveHeart(_ref) {
     if (buffered - current > 5) {
       console.debug("\u5F53\u524D\u5EF6\u65F6\u8FC7\u5927current->".concat(current, " buffered->").concat(buffered, ", \u57FA\u4E8E\u89C6\u9891\u5F53\u524D\u7F13\u5B58\u65F6\u95F4\u66F4\u65B0\u5F53\u524D\u64AD\u653E\u65F6\u95F4 updateTime -> ").concat(buffered - 2));
       api.seekTo(buffered - 2 > 0 ? buffered - 2 : 0);
+      api.play();
     }
   };
 
@@ -41,21 +24,13 @@ function LiveHeart(_ref) {
     BrowserTab.addEventListener(browserTabChange);
     return function () {
       BrowserTab.removeEventListener(browserTabChange);
-    };
+    }; // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [api]);
 
-  _useUpdateEffect(function () {
-    run();
-  }, [runDep]);
+  _useRafInterval(function () {
+    return run();
+  }, 30 * 1000);
 
-  useEffect(function () {
-    var timer = setInterval(function () {
-      return setRundep(Date.now());
-    }, 30 * 1000);
-    return function () {
-      return clearInterval(timer);
-    };
-  }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null);
 }
 

package/es/ScreenPlayer/Live.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
 import type { ILivePlayerProps } from './interface';
 import './index.less';
-declare function LivePlayer({ list, children }: ILivePlayerProps): JSX.Element;
+declare function LivePlayer({ list, children, onIndexChange, onClose, onCloseAll }: ILivePlayerProps): JSX.Element;
 export default LivePlayer;

package/es/ScreenPlayer/Live.js

@@ -10,7 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useMemo, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { ScreenType, mergeFill } from './utils';
 import { LivePlayerWithExt } from './PlayerWithExt';
 import Tools from './LiveTools';
@@ -20,7 +20,10 @@ import "./index.css";
 function LivePlayer(_ref) {
   var _ref$list = _ref.list,
       list = _ref$list === void 0 ? [] : _ref$list,
-      children = _ref.children;
+      children = _ref.children,
+      onIndexChange = _ref.onIndexChange,
+      onClose = _ref.onClose,
+      onCloseAll = _ref.onCloseAll;
 
   var _useState = useState({
     screenNum: 4,
@@ -73,8 +76,13 @@ function LivePlayer(_ref) {
     setState(function (old) {
       return Object.assign(Object.assign({}, old), obj);
     });
-  };
+  }; // index变化同步到父组件
+  // eslint-disable-next-line react-hooks/exhaustive-deps
 
+
+  useEffect(function () {
+    return onIndexChange(state.selectIndex);
+  }, [state.selectIndex]);
   return /*#__PURE__*/React.createElement("div", {
     className: "split-screen-player-wrapper",
     ref: domRef
@@ -102,6 +110,8 @@ function LivePlayer(_ref) {
       }
     }));
   })), /*#__PURE__*/React.createElement(Tools, {
+    onClose: onClose,
+    onCloseAll: onCloseAll,
     fit: fit,
     toggleFit: toggleFit,
     getPlayerItem: getPlayerItem,

package/es/ScreenPlayer/LiveTools.d.ts

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

package/es/ScreenPlayer/LiveTools.js

@@ -24,7 +24,9 @@ function LiveTools(_ref) {
       getPlayerItem = _ref.getPlayerItem,
       mode = _ref.mode,
       toggleFit = _ref.toggleFit,
-      fit = _ref.fit;
+      fit = _ref.fit,
+      onClose = _ref.onClose,
+      onCloseAll = _ref.onCloseAll;
 
   var _useFullscreen = _useFullscreen3(containerRef),
       _useFullscreen2 = _slicedToArray(_useFullscreen, 2),
@@ -76,7 +78,8 @@ function LiveTools(_ref) {
     type: "lm-player-Refresh_Main",
     title: "\u91CD\u8F7D"
   })), /*#__PURE__*/React.createElement("span", {
-    className: "player-tools-item"
+    className: "player-tools-item",
+    onClick: onClose
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lm-player-YesorNo_No_Dark",
     title: "\u5173\u95ED\u5F53\u524D"
@@ -94,7 +97,8 @@ function LiveTools(_ref) {
   }))), /*#__PURE__*/React.createElement("div", {
     className: "player-tools-right"
   }, /*#__PURE__*/React.createElement("span", {
-    className: "player-tools-item"
+    className: "player-tools-item",
+    onClick: onCloseAll
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lm-player-YesorNo_No_Dark",
     title: "\u5173\u95ED\u6240\u6709"

package/es/ScreenPlayer/Record.d.ts

@@ -6,5 +6,5 @@ import './index.less';
  * @param param0
  * @returns
  */
-declare function RecordPlayer({ list, children, queryRecord, onIndexChange }: IRecordPlayerProps): JSX.Element;
+declare function RecordPlayer({ list, children, queryRecord, onIndexChange, onClose, onCloseAll }: IRecordPlayerProps): JSX.Element;
 export default RecordPlayer;

package/es/ScreenPlayer/Record.js

@@ -1,5 +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 "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; }
@@ -32,6 +34,7 @@ import RecordTools from './RecordTools';
 import SegmentTimeLine from './SegmentTimeLine';
 import useRecordList from './useRecordList';
 import useVideoFit from './useVideoFit';
+import DisableMark from '../DisableMark';
 import "./index.css";
 /**
  * @desc 录像设计的时间全部需要到毫秒
@@ -45,7 +48,9 @@ function RecordPlayer(_ref) {
   var list = _ref.list,
       children = _ref.children,
       queryRecord = _ref.queryRecord,
-      onIndexChange = _ref.onIndexChange;
+      onIndexChange = _ref.onIndexChange,
+      onClose = _ref.onClose,
+      onCloseAll = _ref.onCloseAll;
 
   var _useState = useState({
     screenNum: 4,
@@ -54,7 +59,8 @@ function RecordPlayer(_ref) {
     currentTimes: [],
     loading: false,
     seekTo: 0,
-    mergeSegments: []
+    mergeSegments: [],
+    timeMode: 24
   }),
       _useState2 = _slicedToArray(_useState, 2),
       state = _useState2[0],
@@ -199,6 +205,10 @@ function RecordPlayer(_ref) {
       obj.mode = newState.mode;
     }
 
+    if (newState.hasOwnProperty('timeMode')) {
+      obj.timeMode = newState.timeMode;
+    }
+
     setState(function (old) {
       return Object.assign(Object.assign({}, old), obj);
     });
@@ -210,7 +220,7 @@ function RecordPlayer(_ref) {
    */
 
 
-  var onTimeChange = useCallback(function (time) {
+  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) {
@@ -225,23 +235,34 @@ function RecordPlayer(_ref) {
               return _context.abrupt("return");
 
             case 2:
+              if (!(outTimeline && segmentItem.recordType === 1)) {
+                _context.next = 5;
+                break;
+              }
+
+              // 云录像 若点击了缺失的片段，直接忽略
+              _message.warning('当前录像片段缺失！');
+
+              return _context.abrupt("return");
+
+            case 5:
               index = segmentItem.segments.findIndex(function (v) {
                 return time >= v.beginTime && time < v.endTime;
               });
 
               if (!(index === -1)) {
-                _context.next = 8;
+                _context.next = 11;
                 break;
               }
 
-              _context.next = 6;
+              _context.next = 9;
               return queryRecord({
                 cid: segmentItem.cid,
                 date: time,
                 recordType: segmentItem.recordType
               });
 
-            case 6:
+            case 9:
               segments = _context.sent;
               setState(function (old) {
                 return Object.assign(Object.assign({}, old), {
@@ -249,7 +270,7 @@ function RecordPlayer(_ref) {
                 });
               });
 
-            case 8:
+            case 11:
               //更新time
               setState(function (old) {
                 var mergeSegments = old.mergeSegments;
@@ -270,7 +291,7 @@ function RecordPlayer(_ref) {
                 });
               });
 
-            case 9:
+            case 12:
             case "end":
               return _context.stop();
           }
@@ -338,7 +359,11 @@ function RecordPlayer(_ref) {
         height: screenType.height
       }
     }));
-  })), /*#__PURE__*/React.createElement(RecordTools, {
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "player-tools-group"
+  }, /*#__PURE__*/React.createElement(DisableMark, {
+    disabled: !segmentItem.cid
+  }, /*#__PURE__*/React.createElement(RecordTools, {
     time: state.currentTimes[state.selectIndex],
     fit: fit,
     toggleFit: toggleFit,
@@ -347,14 +372,18 @@ function RecordPlayer(_ref) {
     mode: state.mode,
     containerRef: domRef,
     updateState: updateState,
-    onTimeChange: onTimeChange
+    onTimeChange: onTimeChange,
+    onClose: onClose,
+    onCloseAll: onCloseAll,
+    timeMode: state.timeMode
   }), /*#__PURE__*/React.createElement(SegmentTimeLine, {
-    disabled: !!segmentItem.cid,
     begin: timeBegin,
+    updateState: updateState,
     timeCell: segmentItem.segments,
     key: state.selectIndex,
-    onTimeChange: onTimeChange
-  }), children && /*#__PURE__*/React.cloneElement(children, {
+    onTimeChange: onTimeChange,
+    timeMode: state.timeMode
+  }))), children && /*#__PURE__*/React.cloneElement(children, {
     selectIndex: state.selectIndex
   }));
 }

package/es/ScreenPlayer/RecordTools.d.ts

@@ -6,6 +6,7 @@ interface IToolsProps {
     updateState: (state: {
         screenNum?: number;
         mode?: PlayModeType;
+        timeMode?: number;
     }) => void;
     screenNum: number;
     mode: PlayModeType;
@@ -14,6 +15,10 @@ interface IToolsProps {
     toggleFit?: () => void;
     time?: number;
     onTimeChange?: (time: number) => void;
+    onClose?: () => void;
+    onCloseAll?: () => void;
+    timeMode: number;
+    download?: () => void;
 }
-declare function RecordTools({ containerRef, updateState, screenNum, getPlayerItem, mode, toggleFit, fit, time, onTimeChange }: IToolsProps): JSX.Element;
+declare function RecordTools({ containerRef, updateState, download, screenNum, timeMode, getPlayerItem, mode, toggleFit, fit, time, onTimeChange, onClose, onCloseAll }: IToolsProps): JSX.Element;
 export default RecordTools;

package/es/ScreenPlayer/RecordTools.js

@@ -17,17 +17,22 @@ import React from 'react';
 import IconFont from '../Player/iconfont';
 import ScreenSelect from './ScreenSelect';
 import TimeSelect from './TimeSelect';
+import TimeMode from './TimeMode';
 
 function RecordTools(_ref) {
   var containerRef = _ref.containerRef,
       updateState = _ref.updateState,
+      download = _ref.download,
       screenNum = _ref.screenNum,
+      timeMode = _ref.timeMode,
       getPlayerItem = _ref.getPlayerItem,
       mode = _ref.mode,
       toggleFit = _ref.toggleFit,
       fit = _ref.fit,
       time = _ref.time,
-      onTimeChange = _ref.onTimeChange;
+      onTimeChange = _ref.onTimeChange,
+      onClose = _ref.onClose,
+      onCloseAll = _ref.onCloseAll;
 
   var _useFullscreen = _useFullscreen3(containerRef),
       _useFullscreen2 = _slicedToArray(_useFullscreen, 2),
@@ -79,12 +84,14 @@ function RecordTools(_ref) {
     type: "lm-player-Refresh_Main",
     title: "\u91CD\u8F7D"
   })), /*#__PURE__*/React.createElement("span", {
-    className: "player-tools-item"
+    className: "player-tools-item",
+    onClick: onClose
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lm-player-YesorNo_No_Dark",
     title: "\u5173\u95ED\u5F53\u524D"
   })), /*#__PURE__*/React.createElement("span", {
-    className: "player-tools-item"
+    className: "player-tools-item",
+    onClick: download
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lm-player-S_Edit_LoadDown",
     title: "\u4E0B\u8F7D\u5F53\u524D\u5F55\u50CF"
@@ -114,7 +121,8 @@ function RecordTools(_ref) {
   }))), /*#__PURE__*/React.createElement("div", {
     className: "player-tools-right"
   }, /*#__PURE__*/React.createElement("span", {
-    className: "player-tools-item"
+    className: "player-tools-item",
+    onClick: onCloseAll
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lm-player-YesorNo_No_Dark",
     title: "\u5173\u95ED\u6240\u6709"
@@ -149,7 +157,14 @@ function RecordTools(_ref) {
   }) : /*#__PURE__*/React.createElement(IconFont, {
     type: "lm-player-Full_Main",
     title: "\u5168\u5C4F"
-  }))));
+  })), /*#__PURE__*/React.createElement(TimeMode, {
+    timeMode: timeMode,
+    onChange: function onChange(m) {
+      return updateState({
+        timeMode: m
+      });
+    }
+  })));
 }
 
 export default RecordTools;

package/es/ScreenPlayer/SegmentTimeLine.d.ts

@@ -4,7 +4,10 @@ interface ISegmentTimeLineProps {
     begin?: number;
     timeCell?: ISegmentType[];
     onTimeChange?: (time: number) => void;
-    disabled?: boolean;
+    timeMode: number;
+    updateState: (state: {
+        timeMode: number;
+    }) => void;
 }
-declare function SegmentTimeLine({ begin, timeCell, disabled, onTimeChange }: ISegmentTimeLineProps): JSX.Element;
+declare function SegmentTimeLine({ begin, timeCell, onTimeChange, timeMode, updateState }: ISegmentTimeLineProps): JSX.Element;
 export default SegmentTimeLine;

package/es/ScreenPlayer/SegmentTimeLine.js

@@ -1,3 +1,5 @@
+import _useUnmount from "ahooks/es/useUnmount";
+import _useUpdateEffect from "ahooks/es/useUpdateEffect";
 import _useThrottleFn2 from "ahooks/es/useThrottleFn";
 import _useSize from "ahooks/es/useSize";
 import moment from 'moment';
@@ -7,9 +9,11 @@ import TimeSlider from './TimeSlider';
 function SegmentTimeLine(_ref) {
   var begin = _ref.begin,
       timeCell = _ref.timeCell,
-      disabled = _ref.disabled,
-      onTimeChange = _ref.onTimeChange;
+      onTimeChange = _ref.onTimeChange,
+      timeMode = _ref.timeMode,
+      updateState = _ref.updateState;
   var ref = useRef();
+  var timeSliderRef = useRef();
 
   var size = _useSize(ref);
 
@@ -24,21 +28,35 @@ function SegmentTimeLine(_ref) {
       minutes: 0,
       seconds: 0
     }).valueOf();
-    var timeLine = new TimeSlider(ref.current, {
+    timeSliderRef.current = new TimeSlider(ref.current, {
       onTimeChange: run,
-      start_timestamp: time - 12 * 3600 * 1000,
+      start_timestamp: time - timeMode / 2 * 3600 * 1000,
       current_timestamp: time,
-      timecell: timeCell
+      timecell: timeCell,
+      hours_per_ruler: timeMode,
+      onHoursPerChange: function onHoursPerChange(hour) {
+        return updateState({
+          timeMode: hour
+        });
+      }
     });
-    return function () {
-      return timeLine.destory();
-    };
   }, [begin, timeCell, size === null || size === void 0 ? void 0 : size.width, run]);
+  /**
+   * hour变化更新时间轴而不是重绘
+   */
+
+  _useUpdateEffect(function () {
+    return timeSliderRef.current.drawHourChange(timeMode);
+  }, [timeMode]);
+
+  _useUnmount(function () {
+    timeSliderRef.current.destory();
+    timeSliderRef.current = null;
+  });
+
   return /*#__PURE__*/React.createElement("div", {
     className: "record-time-line"
-  }, !disabled && /*#__PURE__*/React.createElement("div", {
-    className: "time-line-mask"
-  }), /*#__PURE__*/React.createElement("canvas", {
+  }, /*#__PURE__*/React.createElement("canvas", {
     ref: ref
   }));
 }

package/es/ScreenPlayer/TimeMode.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+interface ITimeModeProps {
+    timeMode: number;
+    onChange: (timeMode: number) => void;
+}
+declare function TimeMode({ timeMode, onChange }: ITimeModeProps): JSX.Element;
+export default TimeMode;

package/es/ScreenPlayer/TimeMode.js

@@ -0,0 +1,23 @@
+import "antd/lib/select/style";
+import _Select from "antd/lib/select";
+import React from 'react';
+import { TimeModeLibs } from './utils';
+
+function TimeMode(_ref) {
+  var timeMode = _ref.timeMode,
+      onChange = _ref.onChange;
+  return /*#__PURE__*/React.createElement(_Select, {
+    value: timeMode,
+    onChange: onChange,
+    className: "time-mode-select",
+    dropdownClassName: "time-mode-select-dropdown",
+    placement: "topLeft"
+  }, TimeModeLibs.map(function (item) {
+    return /*#__PURE__*/React.createElement(_Select.Option, {
+      value: item.name,
+      key: item.name
+    }, item.name, "\u5C0F\u65F6");
+  }));
+}
+
+export default TimeMode;

package/es/ScreenPlayer/TimeSelect.js

@@ -57,7 +57,6 @@ function TimeSelect(_ref) {
       minutes: values[1],
       seconds: values[2]
     }).valueOf();
-    console.log(values, newTime);
     onChange && onChange(newTime);
   };
 

package/es/ScreenPlayer/TimeSlider.d.ts

@@ -4,7 +4,8 @@ export interface ITimeSliderOptions {
     start_timestamp?: number;
     timecell?: TimeCellItem[];
     current_timestamp?: number;
-    onTimeChange?: (time: number) => void;
+    onTimeChange?: (time: number, outTimeline?: boolean) => void;
+    onHoursPerChange?: (hour: number) => void;
 }
 export declare type TimeCellItem = ISegmentType;
 export default class TimeSlider {
@@ -115,6 +116,7 @@ export default class TimeSlider {
      * 滚轮放大缩小，以时间轴中心为准 mousewheel事件
      */
     mousewheelFunc: (event: any) => void;
+    drawHourChange(hour: number): void;
     /**
      * 获取鼠标posx
      * @param {*} e

package/es/ScreenPlayer/TimeSlider.js

@@ -5,6 +5,8 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 import moment from 'moment';
+import { nextTick } from 'process';
+var hours = [1, 6, 12, 24];
 var currentColor = '#FF000A';
 var normalLineColor = '#ffffff';
 var hoverLineColor = '#319BFF';
@@ -103,7 +105,7 @@ var TimeSlider = /*#__PURE__*/function () {
         _this.drawLine(pos_x, 20, pos_x, _this.canVansH, hoverLineColor, 1);
 
         _this.ctx.fillStyle = hoverLineColor;
-        _this.ctx.font = "10px Arial";
+        _this.ctx.font = '10px Arial';
 
         _this.ctx.fillText(_this.changeTime(current_timestamp), pos_x - 50, 12);
       }
@@ -131,18 +133,15 @@ var TimeSlider = /*#__PURE__*/function () {
 
         var timecellItem = _this.timecell.find(function (v) {
           return current_timestamp >= v.beginTime && current_timestamp < v.endTime;
-        });
+        }); // 当前片段没有录像的时候
 
-        if (timecellItem && !timecellItem.url) {
-          // 无录像轴 不让点击
-          return;
-        }
 
+        var outTimeline = timecellItem && !timecellItem.url;
         _this.current_timestamp = current_timestamp;
 
         _this.set_time_to_middle(_this.current_timestamp);
 
-        _this.options.onTimeChange && _this.options.onTimeChange(current_timestamp);
+        _this.options.onTimeChange && _this.options.onTimeChange(current_timestamp, outTimeline);
       }
 
       document.removeEventListener('mousemove', _this.mousemoveFunc);
@@ -180,24 +179,33 @@ var TimeSlider = /*#__PURE__*/function () {
       var middle_time = _this.start_timestamp + _this.hours_per_ruler * 3600 * 1000 / 2; //ms 记住当前中间的时间
 
       if (delta < 0) {
-        _this.zoom = _this.zoom + 4;
+        // 缩小
+        var index = hours.indexOf(_this.zoom);
 
-        if (_this.zoom >= 24) {
-          _this.zoom = 24; //放大最大24小时
+        if (index === hours.length - 1) {
+          _this.zoom = hours[index];
+        } else {
+          _this.zoom = hours[index + 1];
         }
 
         _this.hours_per_ruler = _this.zoom;
       } else if (delta > 0) {
         // 放大
-        _this.zoom = _this.zoom - 4;
+        var _index = hours.indexOf(_this.zoom);
 
-        if (_this.zoom <= 1) {
-          _this.zoom = 1; //缩小最小1小时
+        if (_index === 0) {
+          _this.zoom = hours[0];
+        } else {
+          _this.zoom = hours[_index - 1];
         }
 
         _this.hours_per_ruler = _this.zoom;
       }
 
+      nextTick(function () {
+        return _this.options.onHoursPerChange && _this.options.onHoursPerChange(_this.hours_per_ruler);
+      });
+
       _this.clearCanvas();
 
       _this.start_timestamp = middle_time - _this.hours_per_ruler * 3600 * 1000 / 2; //start_timestamp = 当前中间的时间 - zoom/2
@@ -233,7 +241,7 @@ var TimeSlider = /*#__PURE__*/function () {
     this.options = options;
     this.canvansW = this.canvas.width = this.canvas.clientWidth;
     this.canVansH = this.canvas.height = this.canvas.clientHeight;
-    this.hours_per_ruler = (_a = this.options.hours_per_ruler) !== null && _a !== void 0 ? _a : this.hours_per_ruler;
+    this.zoom = this.hours_per_ruler = (_a = this.options.hours_per_ruler) !== null && _a !== void 0 ? _a : this.hours_per_ruler;
     this.start_timestamp = (_b = this.options.start_timestamp) !== null && _b !== void 0 ? _b : this.start_timestamp;
     this.current_timestamp = (_c = this.options.current_timestamp) !== null && _c !== void 0 ? _c : this.current_timestamp;
     this.timecell = (_d = this.options.timecell) !== null && _d !== void 0 ? _d : this.timecell;
@@ -360,13 +368,13 @@ var TimeSlider = /*#__PURE__*/function () {
           lineH = 10;
           var big_date = this.graduation_title(date);
           this.ctx.fillStyle = normalLineColor;
-          this.ctx.font = "10px Arial";
+          this.ctx.font = '10px Arial';
           this.ctx.fillText(big_date, graduation_left - 12, 30);
         } else if (graduation_time / (60 * 1000) % medium_step === 0) {
           lineH = 10;
           var middle_date = this.graduation_title(date);
           this.ctx.fillStyle = normalLineColor;
-          this.ctx.font = "10px Arial";
+          this.ctx.font = '10px Arial';
           this.ctx.fillText(middle_date, graduation_left - (middle_date.length > 5 ? 24 : 12), 30);
         } else {
           lineH = 5;
@@ -515,6 +523,17 @@ var TimeSlider = /*#__PURE__*/function () {
         }
       }
     }
+  }, {
+    key: "drawHourChange",
+    value: function drawHourChange(hour) {
+      var middle_time = this.start_timestamp + this.hours_per_ruler * 3600 * 1000 / 2; //ms 记住当前中间的时间
+
+      this.hours_per_ruler = this.zoom = hour;
+      this.clearCanvas();
+      this.start_timestamp = middle_time - this.hours_per_ruler * 3600 * 1000 / 2; //start_timestamp = 当前中间的时间 - zoom/2
+
+      this.init(this.start_timestamp, this.timecell, true);
+    }
     /**
      * 清除canvas 每次重新绘制需要先清除
      */

package/es/ScreenPlayer/demo.js

@@ -24,6 +24,7 @@ export default function App() {
       height: 800
     }
   }, /*#__PURE__*/React.createElement(LivePlayer, {
-    list: list
+    list: list,
+    onIndexChange: console.log
   })));
 }

package/es/ScreenPlayer/index.css

@@ -6,7 +6,7 @@
   min-width: 600px;
 }
 .split-screen-player-wrapper .player-layout {
-  height: calc(100% - 42px);
+  height: calc(100% - 88px);
 }
 .split-screen-player-wrapper .player-layout .player-with-ext-layout {
   float: left;
@@ -19,6 +19,10 @@
 .split-screen-player-wrapper .player-layout .player-with-ext-layout.player-current-index .lm-player-ext-layout {
   border: 1px solid var(--primary);
 }
+.split-screen-player-wrapper .player-tools-group {
+  height: 88px;
+  position: relative;
+}
 .split-screen-player-wrapper .player-record-time {
   width: 100%;
   height: 100%;
@@ -95,12 +99,26 @@
   z-index: 5;
   cursor: not-allowed;
 }
-.split-screen-player-wrapper.split-screen-player-wrapper-record .player-layout {
-  height: calc(100% - 42px - 60px);
-}
 .player-time-select {
   width: 190px;
   display: flex;
   justify-content: space-around;
   align-items: center;
 }
+.time-mode-select {
+  font-size: var(--fs-small);
+  color: var(--gray1);
+}
+.time-mode-select .cloudapp-select-selector {
+  background-color: transparent !important;
+  border-radius: var(--radius1) !important;
+}
+.time-mode-select .anticon {
+  color: var(--gray1);
+}
+.time-mode-select-dropdown {
+  font-size: var(--fs-small);
+}
+.time-mode-select-dropdown .cloudapp-select-item {
+  font-size: var(--fs-small);
+}

package/es/ScreenPlayer/interface.d.ts

@@ -23,6 +23,20 @@ export interface IRecordPlayerProps {
    * 窗口索引变化，后续基于索引传入播放必要数据
    */
   onIndexChange: (idx: number) => void;
+
+  /**
+   * 关闭单个窗口
+   */
+  onClose?: () => void;
+
+  /**
+   * 关闭所有窗口
+   */
+  onCloseAll?: () => void;
+  /**
+   * 录像下载回调
+   */
+  download?: () => void;
 }
 
 export interface IRecordPlayerState {
@@ -60,6 +74,11 @@ export interface IRecordPlayerState {
    * 加载中，用于拦截多次时间轴变化需要加载片段的情况
    */
   loading?: boolean;
+
+  /**
+   * 录像时间轴单页绘制时长单位（hour）
+   */
+  timeMode: number;
 }
 
 export type ScreenItemLivePlayerType = {
@@ -70,6 +89,20 @@ export type ScreenItemLivePlayerType = {
 export interface ILivePlayerProps {
   list?: ScreenItemLivePlayerType[];
   children?: JSX.Element;
+
+  /**
+   * 关闭单个窗口
+   */
+  onClose?: () => void;
+
+  /**
+   * 关闭所有窗口
+   */
+  onCloseAll?: () => void;
+  /**
+   * 窗口索引变化，后续基于索引传入播放必要数据
+   */
+  onIndexChange: (idx: number) => void;
 }
 
 export interface ILivePlayerState {

package/es/ScreenPlayer/utils.d.ts

@@ -4,6 +4,9 @@ export declare const ScreenType: {
     width: string;
     height: string;
 }[];
+export declare const TimeModeLibs: {
+    name: number;
+}[];
 export declare function mergeFill<T, S>(len: number, mergeArr: T[], fillItem: S): (T | S)[];
 export declare const FILTER_KEY = "00|11|00";
 /**

package/es/ScreenPlayer/utils.js

@@ -15,6 +15,15 @@ export var ScreenType = [{
   width: '25%',
   height: '25%'
 }];
+export var TimeModeLibs = [{
+  name: 24
+}, {
+  name: 12
+}, {
+  name: 6
+}, {
+  name: 1
+}];
 export function mergeFill(len, mergeArr, fillItem) {
   return new Array(len).fill(fillItem).map(function (v, i) {
     return mergeArr[i] ? mergeArr[i] : v;

package/es/index.d.ts

@@ -6,6 +6,7 @@ export { default as Box } from './Box';
 export { default as CheckGroupFixed } from './CheckGroupFixed';
 export { default as Config } from './Config';
 export { default as ConfigContext } from './ConfigContext';
+export { default as DisableMark } from './DisableMark';
 export { default as DomMove } from './DomMove';
 export { default as Drag } from './Drag';
 export { default as Drawer } from './Drawer';

package/es/index.js

@@ -6,6 +6,7 @@ export { default as Box } from './Box';
 export { default as CheckGroupFixed } from './CheckGroupFixed';
 export { default as Config } from './Config';
 export { default as ConfigContext } from './ConfigContext';
+export { default as DisableMark } from './DisableMark';
 export { default as DomMove } from './DomMove';
 export { default as Drag } from './Drag';
 export { default as Drawer } from './Drawer';

package/package.json

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