@cloud-app-dev/vidc 2.3.0 → 3.0.2

package/es/Player/segment_timeline.js

@@ -16,7 +16,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useCallback, useMemo } from 'react';
 import { useTimes } from './timeline';
 import useBarStatus from './contraller_bar/useBarStatus';
-import { dateFormat } from './util';
+import moment from 'moment';
+import { FMT } from './util';
 import "./style/timeline.css";
 
 function SegmentTimeLine(_ref) {
@@ -36,11 +37,11 @@ function SegmentTimeLine(_ref) {
 
   var indexDuration = useMemo(function () {
     return segments.map(function (v) {
-      return v.duration;
+      return (v.endTime - v.beginTime) / 1000;
     }).reduce(function (a, b, i) {
       return i >= index ? a : a + b;
     }, 0);
-  }, [index]);
+  }, [index, segments]);
   var playPercent = useMemo(function () {
     return (currentTime + indexDuration) / duration * 100;
   }, [currentTime, duration, indexDuration]);
@@ -66,7 +67,7 @@ function SegmentTimeLine(_ref) {
     } else {
       api.seekTo(currentTime);
     }
-  }, [api, segments, index]);
+  }, [segments, api, index, setIndex]);
   return /*#__PURE__*/React.createElement("div", {
     className: "player-timeline-layout player-segment-timeline-layout ".concat(status === 0 ? 'hide-time-line' : '')
   }, /*#__PURE__*/React.createElement("div", {
@@ -85,7 +86,7 @@ function SegmentTimeLine(_ref) {
         return seekWithLine(e, i);
       },
       style: {
-        width: "".concat(v.duration / duration * 100, "%")
+        width: "".concat((v.endTime / 1000 - v.beginTime / 1000) / duration * 100, "%")
       }
     }));
   }), /*#__PURE__*/React.createElement("div", {
@@ -110,24 +111,24 @@ function TipTitle(_ref2) {
     if (index === 0) {
       var _start = begin;
 
-      var _end = begin + segments[0].duration * 1000;
+      var _end = begin + (segments[0].endTime - segments[0].beginTime);
 
       return {
-        start: dateFormat(_start),
-        end: dateFormat(_end)
+        start: moment(_start).format(FMT),
+        end: moment(_end).format(FMT)
       };
     }
 
     var indexDuration = segments.map(function (v) {
-      return v.duration;
+      return v.endTime - v.beginTime;
     }).reduce(function (a, b, i) {
       return i >= index ? a : a + b;
     }, 0);
-    var start = begin + indexDuration * 1000;
-    var end = start + segments[index].duration * 1000;
+    var start = begin + indexDuration;
+    var end = start + (segments[index].endTime - segments[index].beginTime);
     return {
-      start: dateFormat(start),
-      end: dateFormat(end)
+      start: moment(start).format(FMT),
+      end: moment(end).format(FMT)
     };
   }, [index, segments, begin]),
       start = _useMemo.start,

package/es/Player/single_player.js

@@ -1,3 +1,5 @@
+import _useToggle3 from "ahooks/es/useToggle";
+
 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."); }
@@ -32,7 +34,9 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       isLive = _a.isLive,
       errorReloadTimer = _a.errorReloadTimer,
       children = _a.children,
-      props = __rest(_a, ["className", "url", "type", "hideContrallerBar", "isLive", "errorReloadTimer", "children"]);
+      onCanPlayerInit = _a.onCanPlayerInit,
+      extActions = _a.extActions,
+      props = __rest(_a, ["className", "url", "type", "hideContrallerBar", "isLive", "errorReloadTimer", "children", "onCanPlayerInit", "extActions"]);
 
   var autoPlay = props.autoPlay,
       preload = props.preload,
@@ -55,7 +59,12 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   }),
       _useState2 = _slicedToArray(_useState, 2),
       state = _useState2[0],
-      setState = _useState2[1]; // 视频格式判断，外部可以强制指定，也可以通过url自动判断
+      setState = _useState2[1];
+
+  var _useToggle = _useToggle3('contain', 'fill'),
+      _useToggle2 = _slicedToArray(_useToggle, 2),
+      fit = _useToggle2[0],
+      toggle = _useToggle2[1].toggle; // 视频格式判断，外部可以强制指定，也可以通过url自动判断
 
 
   var vType = useMemo(function () {
@@ -93,34 +102,66 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   }, []); // 特殊接口实现 reload是可能被重写的,但是API只暴露原生的方法
 
   var reload = function reload() {
-    return playReload(video, flv, hls, url);
+    return playReload(video, event, flv, hls, url);
   };
 
   var unload = function unload() {
     return playUnload(video, flv, hls);
-  }; // 合并api
+  }; // 合并api,加上代理
 
 
   var playApi = useMemo(function () {
-    return Object.assign(Object.assign({}, api), {
+    if (!api) {
+      return undefined;
+    }
+
+    var map = Object.assign({
       reload: reload,
-      unload: unload
+      unload: unload,
+      toggleFit: toggle
+    }, extActions);
+    return new Proxy(api, {
+      get: function get(target, key) {
+        var _a;
+
+        return (_a = map[key]) !== null && _a !== void 0 ? _a : target[key];
+      },
+      set: function set() {
+        return true;
+      }
+    }); // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [api]); // 代理Event
+
+  var playEvent = useMemo(function () {
+    if (!event) {
+      return undefined;
+    }
+
+    return new Proxy(event, {
+      get: function get(target, key) {
+        return target[key];
+      },
+      set: function set() {
+        return true;
+      }
     });
-  }, [api]); // ref暴露接口
+  }, [event]); // ref暴露接口
 
   useImperativeHandle(ref, function () {
     return {
       video: video,
       container: state.container,
       api: playApi,
-      event: event,
-      plugins: [flv, hls]
+      event: playEvent,
+      plugins: [flv, hls],
+      fit: fit
     };
-  }, [api, event, video]);
+  }, [video, state.container, playApi, playEvent, flv, hls, fit]);
   useEffect(function () {
     if (api && event && video) {
-      props.onCanPlayerInit && props.onCanPlayerInit();
-    }
+      onCanPlayerInit && onCanPlayerInit();
+    } // eslint-disable-next-line react-hooks/exhaustive-deps
+
   }, [api, event, video]);
   return /*#__PURE__*/React.createElement("div", {
     className: "lm-player-container ".concat(className),
@@ -128,6 +169,9 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "player-mask-layout"
   }, /*#__PURE__*/React.createElement("video", {
+    style: {
+      objectFit: fit
+    },
     autoPlay: autoPlay,
     preload: preload,
     muted: muted,
@@ -152,7 +196,7 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     leftMidExtContents: leftMidExtContents,
     reload: (_b = props.reload) !== null && _b !== void 0 ? _b : reload,
     hideTimeProgress: !!customTimeLine
-  })), !isLive ? customTimeLine ? customTimeLine : /*#__PURE__*/React.createElement(Timeline, {
+  })), customTimeLine ? customTimeLine : !hideContrallerBar ? /*#__PURE__*/React.createElement(Timeline, {
     api: playApi,
     event: event
   }) : null, /*#__PURE__*/React.createElement(ErrorEvent, {
@@ -181,6 +225,7 @@ SinglePlayer.defaultProps = {
     mediaDataSource: {},
     config: {}
   },
-  hlsConfig: {}
+  hlsConfig: {},
+  extActions: {}
 };
 export default /*#__PURE__*/React.memo(SinglePlayer);

package/es/Player/timeline.js

@@ -22,11 +22,11 @@ export function useTimes(api, event, isHide) {
       state = _useState2[0],
       setState = _useState2[1];
 
-  if (isHide) {
-    return [0, 0, 0];
-  }
-
   useEffect(function () {
+    if (isHide) {
+      return undefined;
+    }
+
     var getCurrentTime = function getCurrentTime() {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {
@@ -58,8 +58,10 @@ export function useTimes(api, event, isHide) {
       event.removeEventListener('suspend', getBuffered);
       event.removeEventListener('seeked', seekendPlay);
     };
-  }, [event, api]);
-  return [state.currentTime, state.buffered, api.getDuration()];
+  }, [event, api, isHide]);
+  return useMemo(function () {
+    return [state.currentTime, state.buffered, api.getDuration()];
+  }, [state.currentTime, state.buffered]);
 }
 
 function TimeLine(_ref) {

package/es/Player/util.d.ts

@@ -1,5 +1,6 @@
 import Flvjs from 'flv.zv.js';
 import Hls, { HlsConfig } from 'hls.js';
+import type VideoEventInstance from './event';
 import type { FlvPlayerConfig } from './player';
 /**
  * 创建HLS对象
@@ -13,7 +14,7 @@ export declare function createHlsPlayer(video: HTMLVideoElement, url: string, hl
  * @param {*} options
  */
 export declare function createFlvPlayer(video: HTMLVideoElement, url: string, isLive?: boolean, flvConfig?: FlvPlayerConfig): Flvjs.Player;
-export declare const playReload: (video: HTMLVideoElement, flv?: Flvjs.Player, hls?: Hls, url?: string) => void;
+export declare const playReload: (video: HTMLVideoElement, event: VideoEventInstance, flv?: Flvjs.Player, hls?: Hls, url?: string) => void;
 export declare const playUnload: (video: HTMLVideoElement, flv?: Flvjs.Player, hls?: Hls) => void;
 /**
  * 获取播放文件类型
@@ -21,28 +22,6 @@ export declare const playUnload: (video: HTMLVideoElement, flv?: Flvjs.Player, h
  */
 export declare function getVideoType(url: string): "flv" | "native" | "m3u8";
 export declare function timeStamp(second: number): string;
-/**
- * 日期格式化
- * @param {*} timetemp
- */
-export declare function dateFormat(timetemp: number): string;
-/**
- * 全屏
- * @param {*} element
- */
-export declare function fullscreen(element: HTMLElement): void;
-/**
- * exitFullscreen 退出全屏
- * @param  {Objct} element 选择器
- */
-export declare function exitFullscreen(): void;
-/**
- * 判读是否支持全屏
- */
-export declare function fullscreenEnabled(): boolean;
-/**
- * [isFullscreen 判断浏览器是否全屏]
- * @return [全屏则返回当前调用全屏的元素,不全屏返回false]
- */
-export declare function isFullscreen(ele: HTMLElement): boolean;
 export declare function getRandom(): string;
+export declare function tryCatch(fn: () => void | Promise<any>): Promise<void>;
+export declare const FMT = "YYYY-MM-DD HH:mm:ss";

package/es/Player/util.js

@@ -1,5 +1,11 @@
+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); }
+
+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; }
+
+import { __awaiter } from "tslib";
 import Flvjs from 'flv.zv.js';
 import Hls from 'hls.js';
+import Events from './event/eventName';
 /**
  * 创建HLS对象
  * @param {*} video
@@ -54,14 +60,16 @@ export function createFlvPlayer(video, url, isLive, flvConfig) {
   player.load();
   return player;
 }
-export var playReload = function playReload(video, flv, hls, url) {
+export var playReload = function playReload(video, event, flv, hls, url) {
   video.pause();
   video.removeAttribute('src');
 
   if (flv) {
     flv.unload();
     flv.load();
-    flv.play();
+    tryCatch(function () {
+      return flv.play();
+    });
   }
 
   if (hls) {
@@ -70,13 +78,19 @@ export var playReload = function playReload(video, flv, hls, url) {
     hls.stopLoad();
     hls.startLoad();
     hls.loadSource(url);
-    video.play();
+    tryCatch(function () {
+      return video.play();
+    });
   }
 
   if (!flv && !hls) {
     video.setAttribute('src', url);
-    video.play();
+    tryCatch(function () {
+      return video.play();
+    });
   }
+
+  event.emit(Events.RELOAD);
 };
 export var playUnload = function playUnload(video, flv, hls) {
   video.pause();
@@ -117,56 +131,34 @@ export function timeStamp(second) {
 
   return "".concat(h < 10 ? '0' + h : h, ":").concat(m < 10 ? '0' + m : m, ":").concat(s < 10 ? '0' + s : s);
 }
-/**
- * 日期格式化
- * @param {*} timetemp
- */
-
-export function dateFormat(timetemp) {
-  var date = new Date(timetemp);
-  var YYYY = date.getFullYear();
-  var DD = date.getDate();
-  var MM = date.getMonth() + 1;
-  var hh = date.getHours();
-  var mm = date.getMinutes();
-  var ss = date.getSeconds();
-  return "".concat(YYYY, ".").concat(MM > 9 ? MM : '0' + MM, ".").concat(DD > 9 ? DD : '0' + DD, " ").concat(hh > 9 ? hh : '0' + hh, ".").concat(mm > 9 ? mm : '0' + mm, ".").concat(ss > 9 ? ss : '0' + ss);
-}
-/**
- * 全屏
- * @param {*} element
- */
-
-export function fullscreen(element) {
-  element.requestFullscreen();
-}
-/**
- * exitFullscreen 退出全屏
- * @param  {Objct} element 选择器
- */
-
-export function exitFullscreen() {
-  document.exitFullscreen();
-}
-/**
- * 判读是否支持全屏
- */
-
-export function fullscreenEnabled() {
-  return document.fullscreenEnabled;
-}
-/**
- * [isFullscreen 判断浏览器是否全屏]
- * @return [全屏则返回当前调用全屏的元素,不全屏返回false]
- */
-
-export function isFullscreen(ele) {
-  if (!ele) {
-    return false;
-  }
-
-  return document.fullscreenElement === ele;
-}
 export function getRandom() {
   return Math.random().toString(36).substr(2);
-}
+}
+export function tryCatch(fn) {
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return fn();
+
+          case 3:
+            _context.next = 8;
+            break;
+
+          case 5:
+            _context.prev = 5;
+            _context.t0 = _context["catch"](0);
+            console.debug(_context.t0);
+
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[0, 5]]);
+  }));
+}
+export var FMT = 'YYYY-MM-DD HH:mm:ss';

package/es/PlayerExt/index.css

@@ -1,4 +1,4 @@
-.lm-player-ext-layput {
+.lm-player-ext-layout {
   background-color: #000;
   width: 100%;
   height: 100%;
@@ -8,6 +8,6 @@
   align-items: center;
   justify-content: center;
 }
-.lm-player-ext-layput .lm-player-PlaySource {
+.lm-player-ext-layout .lm-player-PlaySource {
   font-size: 66px;
 }

package/es/PlayerExt/index.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="react" />
+import { ISegmentType } from '../Player/player';
 import './index.less';
 export declare type PlayModeType = 1 | 2;
 export interface IPluginProps {
     url?: string;
+    segments?: ISegmentType[];
     children: JSX.Element;
     /**
      * @description 模式1浏览器模式，2插件模式
@@ -38,5 +40,5 @@ export declare function getLocalPlayPath(url: string, params?: string): string;
 export declare function usePlugin(mode: PlayModeType, key: any): {
     needInstall: boolean;
 };
-export declare function ExtModel({ url, children, mode, pluginDownloadUrl, pluginParams }: IPluginProps): JSX.Element;
+export declare function ExtModel({ url, children, mode, pluginDownloadUrl, segments, pluginParams }: IPluginProps): JSX.Element;
 export { ExtModel as default };

package/es/PlayerExt/index.js

@@ -77,6 +77,7 @@ export function ExtModel(_ref) {
       children = _ref.children,
       mode = _ref.mode,
       pluginDownloadUrl = _ref.pluginDownloadUrl,
+      segments = _ref.segments,
       pluginParams = _ref.pluginParams;
 
   var _useState3 = useState({
@@ -87,8 +88,10 @@ export function ExtModel(_ref) {
       setState = _useState4[1];
 
   var hasUrl = useMemo(function () {
-    return !!url;
-  }, [url]);
+    return !!url || Array.isArray(segments) && segments.find(function (v) {
+      return v.url;
+    });
+  }, [url, segments]);
 
   var _usePlugin = usePlugin(mode, state.forceKey),
       needInstall = _usePlugin.needInstall;
@@ -96,10 +99,17 @@ export function ExtModel(_ref) {
   var playUrl = useMemo(function () {
     return mode === 2 && url ? getLocalPlayPath(url, pluginParams) : url;
   }, [url, mode]);
+  var playSegments = useMemo(function () {
+    return mode === 2 && segments ? segments.map(function (v) {
+      return Object.assign(Object.assign({}, v), {
+        url: v.url ? getLocalPlayPath(v.url, pluginParams) : v.url
+      });
+    }) : segments;
+  }, [segments, mode]);
 
   if (needInstall) {
     return /*#__PURE__*/React.createElement("div", {
-      className: "lm-player-ext-layput"
+      className: "lm-player-ext-layout"
     }, /*#__PURE__*/React.createElement("div", {
       style: {
         marginTop: -60,
@@ -132,14 +142,18 @@ export function ExtModel(_ref) {
 
   if (!hasUrl) {
     return /*#__PURE__*/React.createElement("div", {
-      className: "lm-player-ext-layput"
+      className: "lm-player-ext-layout"
     }, /*#__PURE__*/React.createElement(IconFont, {
       type: "lm-player-PlaySource"
     }));
   }
 
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.cloneElement(children, {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "lm-player-ext-layout"
+  }, /*#__PURE__*/React.cloneElement(children, url ? {
     url: playUrl
+  } : {
+    segments: playSegments
   }));
 }
 export { ExtModel as default };

package/es/ScreenPlayer/Live.d.ts

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

package/es/ScreenPlayer/Live.js

@@ -0,0 +1,109 @@
+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, { useMemo, useRef, useState } from 'react';
+import { ScreenType, mergeFill } from './utils';
+import { LivePlayerWithExt } from './PlayerWithExt';
+import Tools from './LiveTools';
+import "./index.css";
+
+function LivePlayer(_ref) {
+  var _ref$list = _ref.list,
+      list = _ref$list === void 0 ? [] : _ref$list,
+      children = _ref.children;
+
+  var _useState = useState({
+    screenNum: 4,
+    selectIndex: 0,
+    mode: 1
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      state = _useState2[0],
+      setState = _useState2[1];
+
+  var domRef = useRef(null); // 缓存所有player对象
+
+  var playerRef = useRef([]);
+  var screenType = useMemo(function () {
+    return ScreenType.find(function (v) {
+      return v.name === state.screenNum;
+    });
+  }, [state.screenNum]);
+  var screenList = useMemo(function () {
+    return mergeFill(state.screenNum, list, {});
+  }, [list, state.screenNum]); // 获取选中player对象
+
+  var getPlayerItem = function getPlayerItem() {
+    var _a;
+
+    return (_a = playerRef.current[state.selectIndex]) === null || _a === void 0 ? void 0 : _a.current;
+  }; // 更新状态
+
+
+  var updateState = function updateState(newState) {
+    var obj = {};
+
+    if (newState.hasOwnProperty('screenNum')) {
+      obj.screenNum = newState.screenNum;
+
+      if (obj.screenNum < state.selectIndex) {
+        obj.selectIndex = 0;
+      }
+    }
+
+    if (newState.hasOwnProperty('mode')) {
+      obj.mode = newState.mode;
+    }
+
+    setState(function (old) {
+      return Object.assign(Object.assign({}, old), obj);
+    });
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: "split-screen-player-wrapper",
+    ref: domRef
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "player-layout"
+  }, screenList.map(function (item, index) {
+    return /*#__PURE__*/React.createElement(LivePlayerWithExt, Object.assign({}, item, {
+      mode: state.mode,
+      isLive: true,
+      key: "".concat(item.url, "-").concat(index),
+      updatePlayer: function updatePlayer(player) {
+        return playerRef.current[index] = player;
+      },
+      className: state.selectIndex === index ? 'player-current-index' : '',
+      onClick: function onClick() {
+        return setState(function (old) {
+          return Object.assign(Object.assign({}, old), {
+            selectIndex: index
+          });
+        });
+      },
+      style: {
+        width: screenType.width,
+        height: screenType.height
+      }
+    }));
+  })), /*#__PURE__*/React.createElement(Tools, {
+    getPlayerItem: getPlayerItem,
+    screenNum: state.screenNum,
+    mode: state.mode,
+    containerRef: domRef,
+    updateState: updateState
+  }), children && /*#__PURE__*/React.cloneElement(children, {
+    selectIndex: state.selectIndex
+  }));
+}
+
+export default LivePlayer;

package/es/ScreenPlayer/LiveTools.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+import { ExportPlayerType } from '../Player/player';
+import { PlayModeType } from '../PlayerExt';
+interface IToolsProps {
+    containerRef: React.MutableRefObject<HTMLDivElement>;
+    updateState: (state: {
+        screenNum?: number;
+        mode?: PlayModeType;
+    }) => void;
+    screenNum: number;
+    mode: PlayModeType;
+    getPlayerItem: () => ExportPlayerType | undefined;
+}
+declare function LiveTools({ containerRef, updateState, screenNum, getPlayerItem, mode }: IToolsProps): JSX.Element;
+export default LiveTools;