@cloud-app-dev/vidc 2.2.0-alpha.7 → 3.0.0

package/es/Player/player.d.ts

@@ -129,9 +129,7 @@ export interface ISinglePlayerProps {
   playerEvents?: CustomEvent[];
 }
 
-type OmitPlayerProps = 'customTimeLine' | 'onCanPlayerInit' | 'isLive' | 'reload' | 'type';
-
-export interface IFrontendPlayerProps extends Omit<ISinglePlayerProps, OmitPlayerProps> {
+export interface IFrontendPlayerProps extends Omit<ISinglePlayerProps, 'isLive' | 'reload' | 'type'> {
   /**
    * 前端录像开始时间
    */
@@ -145,10 +143,19 @@ export interface IFrontendPlayerProps extends Omit<ISinglePlayerProps, OmitPlaye
   /**
    * 录像时间轴发生变化回调
    */
-  onSeek(time: number): void;
+  onSeek?: (time: number) => void;
+
+  forwordRef?: React.MutableRefObject<ExportPlayerType>;
+
+  /**
+   * 视频可播放时执行钩子
+   */
+  onCanPlayerInit?: (data: any) => void;
 }
 
-export interface ISegmentPlayerProps extends Omit<ISinglePlayerProps, 'url' | 'customTimeLine' | 'onCanPlayerInit'> {
+export interface ISegmentPlayerProps extends Omit<ISinglePlayerProps, 'url' | 'onCanPlayerInit'> {
+  onCanPlayerInit?: (ext: { [key: string]: any }) => void;
+
   /**
    * 云录像片段信息
    */
@@ -158,6 +165,10 @@ export interface ISegmentPlayerProps extends Omit<ISinglePlayerProps, 'url' | 'c
    * 云录像开始时间
    */
   begin?: number;
+
+  forwordRef?: React.MutableRefObject<ExportPlayerType>;
+
+  defaultIndex?: number;
 }
 
 export const SinglePlayer: React.FunctionComponent<ISinglePlayerProps>;
@@ -190,17 +201,30 @@ export type ExportPlayerType = {
   api: Api;
   event: VideoEventInstance;
   plugins: [FlvJs.Player, Hls];
+  fit?: string;
+  setIndex?: (i: number) => void;
+  seekTo?: (i: number) => void;
+  reload?: () => void;
 };
 
 export interface ISegmentType {
+  id?: string;
   /**
    * 视频片段地址
    */
   url?: string;
+
   /**
-   * 视频片段长度 单位s（秒）
+   * 片段开始时间
    */
-  duration: number;
+  beginTime: number;
+
+  /**
+   * 片段结束时间
+   */
+  endTime: number;
+
+  style?: any;
 }
 
 export const ISegmentTypeDemo: React.FC<ISegmentType>;

package/es/Player/segment_player.d.ts

@@ -5,5 +5,5 @@ import type { ISegmentPlayerProps } from './player';
  * @param param0
  * @returns
  */
-declare function SegmentPlayer({ segments, begin, ...props }: ISegmentPlayerProps): JSX.Element;
+declare function SegmentPlayer({ segments, begin, forwordRef, onCanPlayerInit, defaultIndex, customTimeLine, ...props }: ISegmentPlayerProps): JSX.Element;
 export default SegmentPlayer;

package/es/Player/segment_player.js

@@ -22,6 +22,7 @@ import { __rest } from "tslib";
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import SinglePlayer from './single_player';
 import SegmentTimeLine from './segment_timeline';
+import Events from './event/eventName';
 /**
  * @desc 计算第一个url
  * @param segments
@@ -57,9 +58,12 @@ function getFirstUrlIndex(segments) {
  */
 
 
-function usePlayIndex(event, segments, deps) {
+function usePlayIndex(event, segments) {
+  var defaultIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  var deps = arguments.length > 3 ? arguments[3] : undefined;
+
   var _useState = useState({
-    index: getFirstUrlIndex(segments, 0)
+    index: getFirstUrlIndex(segments, defaultIndex)
   }),
       _useState2 = _slicedToArray(_useState, 2),
       state = _useState2[0],
@@ -124,11 +128,20 @@ function usePlayIndex(event, segments, deps) {
 
 
 function SegmentPlayer(_a) {
-  var _b;
-
   var segments = _a.segments,
       begin = _a.begin,
-      props = __rest(_a, ["segments", "begin"]);
+      forwordRef = _a.forwordRef,
+      _onCanPlayerInit = _a.onCanPlayerInit,
+      defaultIndex = _a.defaultIndex,
+      customTimeLine = _a.customTimeLine,
+      props = __rest(_a, ["segments", "begin", "forwordRef", "onCanPlayerInit", "defaultIndex", "customTimeLine"]);
+
+  var ref = useRef(null);
+  var playRef = forwordRef ? forwordRef : ref;
+
+  var _ref = playRef.current || {},
+      api = _ref.api,
+      event = _ref.event;
 
   var _useState3 = useState({
     forceKey: Date.now()
@@ -139,14 +152,13 @@ function SegmentPlayer(_a) {
 
   var duration = useMemo(function () {
     return segments === null || segments === void 0 ? void 0 : segments.map(function (v) {
-      return v.duration;
+      return (v.endTime - v.beginTime) / 1000;
     }).reduce(function (a, b) {
       return a + b;
     }, 0);
   }, [segments]);
-  var playerRef = useRef(null);
 
-  var _usePlayIndex = usePlayIndex((_b = playerRef.current) === null || _b === void 0 ? void 0 : _b.event, segments, [state.forceKey]),
+  var _usePlayIndex = usePlayIndex(event, segments, defaultIndex, [state.forceKey]),
       index = _usePlayIndex.index,
       setIndex = _usePlayIndex.setIndex;
 
@@ -155,28 +167,28 @@ function SegmentPlayer(_a) {
   }, [segments, index]); // 重置reload
 
   var reload = function reload() {
+    playRef.current.event.emit(Events.RELOAD);
     setIndex(0);
-    playerRef.current.api.reload();
-  };
-
-  var _ref = playerRef.current || {},
-      api = _ref.api,
-      event = _ref.event; // 秒级别转换
+    playRef.current.api.reload();
+  }; // 秒级别转换
 
 
   var beginTemp = useMemo(function () {
     return begin ? String(begin).length === 10 ? Math.floor(begin * 1000) : begin : begin;
   }, []);
   return /*#__PURE__*/React.createElement(SinglePlayer, Object.assign({
-    ref: playerRef,
+    ref: playRef,
     url: url,
     reload: reload,
     onCanPlayerInit: function onCanPlayerInit() {
-      return setState({
+      setState({
         forceKey: Date.now()
       });
+      _onCanPlayerInit && _onCanPlayerInit({
+        setIndex: setIndex
+      });
     },
-    customTimeLine: api && event ? /*#__PURE__*/React.createElement(SegmentTimeLine, {
+    customTimeLine: api && event && (customTimeLine || /*#__PURE__*/React.createElement(SegmentTimeLine, {
       begin: beginTemp,
       api: api,
       event: event,
@@ -184,7 +196,7 @@ function SegmentPlayer(_a) {
       segments: segments,
       duration: duration,
       setIndex: setIndex
-    }) : /*#__PURE__*/React.createElement(React.Fragment, null)
+    }))
   }, props));
 }
 

package/es/Player/segment_timeline.js

@@ -36,7 +36,7 @@ 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);
@@ -85,7 +85,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,7 +110,7 @@ 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),
@@ -119,12 +119,12 @@ function TipTitle(_ref2) {
     }
 
     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)

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."); }
@@ -55,7 +57,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,30 +100,61 @@ 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 = {
       reload: reload,
-      unload: unload
+      unload: unload,
+      toggleFit: toggle
+    };
+    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;
+      }
     });
-  }, [api]); // ref暴露接口
+  }, [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;
+      }
+    });
+  }, [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]);
+  }, [api, event, video, fit]);
   useEffect(function () {
     if (api && event && video) {
       props.onCanPlayerInit && props.onCanPlayerInit();
@@ -128,6 +166,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,

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;
 /**
  * 获取播放文件类型

package/es/Player/util.js

@@ -1,5 +1,6 @@
 import Flvjs from 'flv.zv.js';
 import Hls from 'hls.js';
+import Events from './event/eventName';
 /**
  * 创建HLS对象
  * @param {*} video
@@ -54,7 +55,7 @@ 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');
 
@@ -77,6 +78,8 @@ export var playReload = function playReload(video, flv, hls, url) {
     video.setAttribute('src', url);
     video.play();
   }
+
+  event.emit(Events.RELOAD);
 };
 export var playUnload = function playUnload(video, flv, hls) {
   video.pause();

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 'src/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;