@cloud-app-dev/vidc 3.0.1 → 3.0.4

package/es/ScreenPlayer/PlayerWithExt.js

@@ -1,3 +1,5 @@
+import _useFullscreen3 from "ahooks/es/useFullscreen";
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -16,7 +18,10 @@ import LivePlayer from '../Player/single_player';
 import SegmentPlayer from '../Player/segment_player';
 import FrontendPlayer from '../Player/frontend_player';
 import ExtModel from '../PlayerExt';
+import moment from 'moment';
 export function LivePlayerWithExt(_a) {
+  var _b;
+
   var mode = _a.mode,
       isLive = _a.isLive,
       url = _a.url,
@@ -31,11 +36,18 @@ export function LivePlayerWithExt(_a) {
   var ref = useRef();
   var update = useCallback(function () {
     return updatePlayer(ref);
-  }, []);
+  }, [updatePlayer]);
+
+  var _useFullscreen = _useFullscreen3((_b = ref.current) === null || _b === void 0 ? void 0 : _b.container),
+      _useFullscreen2 = _slicedToArray(_useFullscreen, 2),
+      _ = _useFullscreen2[0],
+      toggleFullscreen = _useFullscreen2[1].toggleFullscreen;
+
   return /*#__PURE__*/React.createElement("div", {
     className: "player-with-ext-layout ".concat(className),
     style: style,
-    onClick: onClick
+    onClick: onClick,
+    onDoubleClick: toggleFullscreen
   }, /*#__PURE__*/React.createElement(ExtModel, {
     url: url,
     mode: mode,
@@ -50,6 +62,8 @@ export function LivePlayerWithExt(_a) {
   }))));
 }
 export function SegmentPlayerWithExt(_a) {
+  var _b;
+
   var begin = _a.begin,
       style = _a.style,
       className = _a.className,
@@ -59,21 +73,20 @@ export function SegmentPlayerWithExt(_a) {
       props = __rest(_a, ["begin", "style", "className", "segments", "updatePlayer", "onClick"]);
 
   var ref = useRef();
+  var update = useCallback(function () {
+    return updatePlayer(ref);
+  }, [updatePlayer]);
 
-  var update = function update() {
-    var obj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
-    for (var k in obj) {
-      ref.current[k] = obj[k];
-    }
-
-    updatePlayer(ref);
-  };
+  var _useFullscreen4 = _useFullscreen3((_b = ref.current) === null || _b === void 0 ? void 0 : _b.container),
+      _useFullscreen5 = _slicedToArray(_useFullscreen4, 2),
+      _ = _useFullscreen5[0],
+      toggleFullscreen = _useFullscreen5[1].toggleFullscreen;
 
   return /*#__PURE__*/React.createElement("div", {
     className: "player-with-ext-layout ".concat(className),
     style: style,
-    onClick: onClick
+    onClick: onClick,
+    onDoubleClick: toggleFullscreen
   }, /*#__PURE__*/React.createElement(ExtModel, {
     segments: segments,
     mode: 1
@@ -97,6 +110,8 @@ export function FrontendPlayerWithExt(_ref) {
       onClick = _ref.onClick,
       pluginDownloadUrl = _ref.pluginDownloadUrl;
 
+  var _a;
+
   var _useState = useState({
     begin: 0,
     end: 0,
@@ -115,7 +130,8 @@ export function FrontendPlayerWithExt(_ref) {
         begin = _ref2[0],
         end = _ref2[1];
     var videoUrl = new URL(segments[0].url);
-    videoUrl.searchParams.set('begin', "".concat(begin));
+    videoUrl.searchParams.set('begin', "".concat(moment(begin).unix()));
+    videoUrl.searchParams.set('end', "".concat(moment(end).unix()));
     setState({
       begin: begin,
       end: end,
@@ -127,31 +143,32 @@ export function FrontendPlayerWithExt(_ref) {
       return;
     }
 
+    var endTime = moment(segments[segments.length - 1].endTime).unix();
+    var beginTime = moment(time).unix();
     var videoUrl = new URL(state.url);
-    videoUrl.searchParams.set('begin', "".concat(time));
+    videoUrl.searchParams.set('begin', "".concat(beginTime));
+    videoUrl.searchParams.set('end', "".concat(endTime));
     setState(function (old) {
       return Object.assign(Object.assign({}, old), {
         url: videoUrl.toString()
       });
     });
-  }, [state.url]);
+  }, [segments, state.url]);
   var ref = useRef();
+  var update = useCallback(function () {
+    return updatePlayer(ref);
+  }, [updatePlayer]);
 
-  var update = function update() {
-    var obj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
-    for (var k in obj) {
-      ref.current[k] = obj[k];
-    }
-
-    ref.current['seekTo'] = seekTo;
-    updatePlayer(ref);
-  };
+  var _useFullscreen6 = _useFullscreen3((_a = ref.current) === null || _a === void 0 ? void 0 : _a.container),
+      _useFullscreen7 = _slicedToArray(_useFullscreen6, 2),
+      _ = _useFullscreen7[0],
+      toggleFullscreen = _useFullscreen7[1].toggleFullscreen;
 
   return /*#__PURE__*/React.createElement("div", {
     className: "player-with-ext-layout ".concat(className),
     style: style,
-    onClick: onClick
+    onClick: onClick,
+    onDoubleClick: toggleFullscreen
   }, /*#__PURE__*/React.createElement(ExtModel, {
     segments: segments,
     mode: mode,
@@ -161,9 +178,13 @@ export function FrontendPlayerWithExt(_ref) {
     url: state.url,
     hideContrallerBar: true,
     forwordRef: ref,
+    extActions: {
+      seekTo: seekTo
+    },
     begin: state.begin,
     end: state.end,
     onCanPlayerInit: update,
-    customTimeLine: /*#__PURE__*/React.createElement(React.Fragment, null)
+    customTimeLine: /*#__PURE__*/React.createElement(React.Fragment, null),
+    type: "flv"
   })));
 }

package/es/ScreenPlayer/Record.d.ts

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

package/es/ScreenPlayer/Record.js

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

package/es/ScreenPlayer/TimeSlider.d.ts

@@ -66,7 +66,7 @@ export default class TimeSlider {
      * @param {*} cell cell包括beginTime ms;endTime ms;style
      */
     draw_cell(cell: TimeCellItem): void;
-    /**
+    /**·
      * 时间轴事件
      */
     add_events(): void;

package/es/ScreenPlayer/TimeSlider.js

@@ -5,10 +5,9 @@ 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';
-var canvasbg = 'rgba(69, 72, 76, 0.5)';
-var currentColor = '#248ffa';
+var currentColor = '#FF000A';
 var normalLineColor = '#ffffff';
-var hoverLineColor = '#248ffa';
+var hoverLineColor = '#319BFF';
 var minPerStep = [1, 2, 5, 10, 15, 20, 30, 60, 120, 180, 240, 360, 720, 1440];
 var minStepSize = 20;
 
@@ -89,21 +88,24 @@ var TimeSlider = /*#__PURE__*/function () {
 
     this.mousemoveFunc2 = function (e) {
       if (!_this.g_isMousedown) {
-        var pos_x = _this.get_cursor_x_position(e);
+        var pos_x = _this.get_cursor_x_position(e); // const px_per_ms = this.canvansW / (this.hours_per_ruler * 60 * 60 * 1000); // px/ms
+        // const current_timestamp = this.start_timestamp + pos_x / px_per_ms;
 
-        var px_per_ms = _this.canvansW / (_this.hours_per_ruler * 60 * 60 * 1000); // px/ms
 
-        _this.clearCanvas();
+        var ms_per_px = _this.hours_per_ruler * 3600 * 1000 / _this.canvansW; // ms/px
 
-        var time = _this.start_timestamp + pos_x / px_per_ms;
+        var current_timestamp = _this.start_timestamp + pos_x * ms_per_px;
+
+        _this.clearCanvas();
 
         _this.init(_this.start_timestamp, _this.timecell, true);
 
-        _this.drawLine(pos_x, 0, pos_x, 40, hoverLineColor, 1);
+        _this.drawLine(pos_x, 20, pos_x, _this.canVansH, hoverLineColor, 1);
 
         _this.ctx.fillStyle = hoverLineColor;
+        _this.ctx.font = "10px Arial";
 
-        _this.ctx.fillText(_this.changeTime(time), pos_x - 50, 50);
+        _this.ctx.fillText(_this.changeTime(current_timestamp), pos_x - 50, 12);
       }
     };
     /**
@@ -120,12 +122,12 @@ var TimeSlider = /*#__PURE__*/function () {
         // click 事件
         _this.g_isMousedown = false;
 
-        var posx = _this.get_cursor_x_position(e); //鼠标距离 px
+        var pos_x = _this.get_cursor_x_position(e); //鼠标距离 px
 
 
-        var ms_per_px = _this.zoom * 3600 * 1000 / _this.canvansW; // ms/px
+        var ms_per_px = _this.hours_per_ruler * 3600 * 1000 / _this.canvansW; // ms/px
 
-        var current_timestamp = _this.start_timestamp + posx * ms_per_px;
+        var current_timestamp = _this.start_timestamp + pos_x * ms_per_px;
 
         var timecellItem = _this.timecell.find(function (v) {
           return current_timestamp >= v.beginTime && current_timestamp < v.endTime;
@@ -136,11 +138,11 @@ var TimeSlider = /*#__PURE__*/function () {
           return;
         }
 
-        _this.current_timestamp = _this.start_timestamp + posx * ms_per_px;
+        _this.current_timestamp = current_timestamp;
 
         _this.set_time_to_middle(_this.current_timestamp);
 
-        _this.options.onTimeChange && _this.options.onTimeChange(_this.current_timestamp);
+        _this.options.onTimeChange && _this.options.onTimeChange(current_timestamp);
       }
 
       document.removeEventListener('mousemove', _this.mousemoveFunc);
@@ -276,15 +278,15 @@ var TimeSlider = /*#__PURE__*/function () {
       var px_per_ms = this.canvansW / (this.hours_per_ruler * 60 * 60 * 1000); // px/ms
 
       var left = px_per_ms * ms_current;
-      this.ctx.fillStyle = currentColor;
-      this.ctx.fillText(this.changeTime(time), left - 50, 50);
-      this.drawLine(left, 0, left, 34, currentColor, 2); //中间当前点线
+      this.ctx.fillStyle = '#ffffff';
+      this.ctx.font = '12px Arial';
+      this.ctx.fillText(this.changeTime(time), left - 64, 14);
+      this.drawLine(left, 20, left, this.canVansH, currentColor, 2); //中间当前点线
     }
   }, {
     key: "drawCellBg",
-    value: function drawCellBg() {
-      this.ctx.fillStyle = canvasbg;
-      this.ctx.fillRect(0, 0, this.canvansW, 15);
+    value: function drawCellBg() {// this.ctx.fillStyle = canvasbg;
+      // this.ctx.fillRect(0, 0, this.canvansW, 15);
     }
   }, {
     key: "get_line_sizes",
@@ -308,9 +310,9 @@ var TimeSlider = /*#__PURE__*/function () {
 
       var medium_step = 30;
 
-      for (var i = 0; i < this.minutes_per_step.length; i++) {
-        if (this.distance_between_gtitle / px_per_min <= this.minutes_per_step[i]) {
-          medium_step = this.minutes_per_step[i];
+      for (var _i = 0; _i < this.minutes_per_step.length; _i++) {
+        if (this.distance_between_gtitle / px_per_min <= this.minutes_per_step[_i]) {
+          medium_step = this.minutes_per_step[_i];
           break;
         }
       }
@@ -354,21 +356,23 @@ var TimeSlider = /*#__PURE__*/function () {
 
         var date = new Date(graduation_time);
 
-        if (date.getUTCHours() == 0 && date.getUTCMinutes() == 0) {
-          lineH = 15;
+        if (date.getUTCHours() === 0 && date.getUTCMinutes() === 0) {
+          lineH = 10;
           var big_date = this.graduation_title(date);
           this.ctx.fillStyle = normalLineColor;
-          this.ctx.fillText(big_date, graduation_left - 12, 34);
-        } else if (graduation_time / (60 * 1000) % medium_step == 0) {
-          lineH = 15;
+          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.fillText(middle_date, graduation_left - (middle_date.length > 5 ? 24 : 12), 34);
+          this.ctx.font = "10px Arial";
+          this.ctx.fillText(middle_date, graduation_left - (middle_date.length > 5 ? 24 : 12), 30);
         } else {
-          lineH = 10;
+          lineH = 5;
         }
 
-        this.drawLine(graduation_left, 0, graduation_left, lineH, normalLineColor, 1);
+        this.drawLine(graduation_left, this.canVansH - lineH, graduation_left, this.canVansH, normalLineColor, 2);
       }
     }
   }, {
@@ -389,7 +393,7 @@ var TimeSlider = /*#__PURE__*/function () {
       var m = datetime.getMinutes();
       var s = datetime.getMilliseconds();
 
-      if (h == 0 && m == 0 && s == 0) {
+      if (h === 0 && m === 0 && s === 0) {
         return moment(datetime).format('YYYY.MM.DD');
       }
 
@@ -443,10 +447,10 @@ var TimeSlider = /*#__PURE__*/function () {
 
       var beginX = (cell.beginTime - this.start_timestamp) * px_per_ms;
       var cell_width = (cell.endTime - cell.beginTime) * px_per_ms;
-      this.ctx.fillStyle = cell.url ? ((_a = cell.style) === null || _a === void 0 ? void 0 : _a.background) || hoverLineColor : '#f32d37';
-      this.ctx.fillRect(beginX, 0, cell_width, 15);
+      this.ctx.fillStyle = cell.url ? ((_a = cell.style) === null || _a === void 0 ? void 0 : _a.background) || hoverLineColor : '#242C3D';
+      this.ctx.fillRect(beginX, this.canVansH - 10, cell_width + 1, this.canVansH);
     }
-    /**
+    /**·
      * 时间轴事件
      */
 

package/es/ScreenPlayer/demo2.js

@@ -28,7 +28,7 @@ import RecordPlayer from './Record';
 import moment from 'moment';
 import Service from '../Service';
 import { completionSegments } from './utils';
-var token = "eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NSIsImV4dCI6MTY2MTA3ODE3NDEzOCwidWlkIjoiMTAxMDAwMDAwNjk5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTA1MTgsMTAwMDAwMTEwNzI4XSwidmFsaWRUaW1lIjoxNzA0MzgzOTk5MDAwLCJvcHRDZW50ZXJJZCI6IjEwMDEwMDAwMDIzMyIsInVzZXJUeXBlIjoxMDA3MDQsImlhdCI6MTY2MDgxODk3NDEzOH0.5aCna8JWe8ynj9SXuXZ3TMDizpnK7WJFeAgJZhSsRvg";
+var token = "eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NSIsImV4dCI6MTY2MTM4OTU0MzA4NSwidWlkIjoiMTAxMDAwMDAwNjk5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTA1MTgsMTAwMDAwMTEwNzI4XSwidmFsaWRUaW1lIjoxNzA0MzgzOTk5MDAwLCJvcHRDZW50ZXJJZCI6IjEwMDEwMDAwMDIzMyIsInVzZXJUeXBlIjoxMDA3MDQsImlhdCI6MTY2MTEzMDM0MzA4NX0.-0vh7SpomB6UWteJ6WIA5VneryhSW3Vrsz6RnHfgcRI";
 var cids = ['538509097', '539172446'];
 
 var query = function query(_ref) {

package/es/ScreenPlayer/index.css

@@ -25,7 +25,7 @@
 }
 .split-screen-player-wrapper.split-screen-player-wrapper-record .record-time-line {
   width: 100%;
-  height: 60px;
+  height: 46px;
   position: relative;
 }
 .split-screen-player-wrapper.split-screen-player-wrapper-record .record-time-line canvas {
@@ -33,8 +33,7 @@
   width: 100%;
   height: 100%;
   cursor: pointer;
-  border-top: 1px solid #2b2f33;
-  background-color: #2b2f33;
+  background-color: #030917;
 }
 .split-screen-player-wrapper.split-screen-player-wrapper-record .record-time-line .time-line-mask {
   position: absolute;

package/es/ScreenPlayer/useVideoFit.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export default function useVideoFit(containerRef: React.MutableRefObject<HTMLDivElement>, deps: any[]): {
+export default function useVideoFit(containerRef: React.MutableRefObject<HTMLDivElement>, deps?: any[]): {
     fit: string;
     toggleFit: () => void;
 };

package/es/ScreenPlayer/useVideoFit.js

@@ -21,7 +21,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { useEffect, useMemo } from 'react';
-export default function useVideoFit(containerRef, deps) {
+export default function useVideoFit(containerRef) {
+  var deps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+
   var _useToggle = _useToggle3('contain', 'fill'),
       _useToggle2 = _slicedToArray(_useToggle, 2),
       fit = _useToggle2[0],
@@ -35,7 +37,7 @@ export default function useVideoFit(containerRef, deps) {
     var videos = containerRef.current.querySelectorAll('video');
     Array.from(videos).forEach(function (item) {
       item.style.objectFit = fit;
-    });
+    }); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [].concat(_toConsumableArray(deps), [fit]));
   return useMemo(function () {
     return {

package/package.json

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

package/release-build.sh

@@ -1,8 +1,37 @@
 #! /bin/sh
 
+pnpm install
+if [ $? -eq 0 ]; then
+  echo "packages install success!"
+else
+  echo "packages install failed!"
+  exit 1
+fi
+
 npm run build
+if [ $? -eq 0 ]; then
+  echo "build success!"
+else
+  echo "build failed!"
+  exit 1
+fi
 
 npm run deploy
+if [ $? -eq 0 ]; then
+  echo "deploy success!"
+else
+  echo "deploy failed!"
+  exit 1
+fi
+
+nrm use npm
+npm publish
+if [ $? -eq 0 ]; then
+  echo "publish success!"
+else
+  echo "publish failed!"
+  exit 1
+fi
 
 git add .
 
@@ -12,8 +41,4 @@ git pull
 
 git push
 
-nrm use npm
-
-npm publish
-
 exit 1