@cloud-app-dev/vidc 2.2.0-alpha.8 → 3.0.1

package/es/Player/frontend_player.js

@@ -14,6 +14,7 @@ import { __rest } from "tslib";
 import React, { useMemo, useRef, useState } from 'react';
 import SinglePlayer from './single_player';
 import FrontendTimeLine from './frontend_timeline';
+import Events from './event/eventName';
 /**
  * @desc 主组件，负责片段整体逻辑控制
  * @param param0
@@ -25,7 +26,10 @@ function FrontendPlayer(_a) {
       begin = _a.begin,
       end = _a.end,
       onSeek = _a.onSeek,
-      props = __rest(_a, ["url", "begin", "end", "onSeek"]);
+      forwordRef = _a.forwordRef,
+      customTimeLine = _a.customTimeLine,
+      _onCanPlayerInit = _a.onCanPlayerInit,
+      props = __rest(_a, ["url", "begin", "end", "onSeek", "forwordRef", "customTimeLine", "onCanPlayerInit"]);
 
   var _useState = useState({
     forceKey: Date.now()
@@ -34,9 +38,10 @@ function FrontendPlayer(_a) {
       state = _useState2[0],
       setState = _useState2[1];
 
-  var playerRef = useRef(null);
+  var ref = useRef(null);
+  var playRef = forwordRef ? forwordRef : ref;
 
-  var _ref = playerRef.current || {},
+  var _ref = playRef.current || {},
       api = _ref.api,
       event = _ref.event; // 秒级别转换毫秒
 
@@ -53,8 +58,9 @@ function FrontendPlayer(_a) {
   // 重置reload
 
   var reload = function reload() {
-    onSeek(beginTemp);
-    playerRef.current.api.reload();
+    playRef.current.event.emit(Events.RELOAD);
+    onSeek && onSeek(beginTemp);
+    playRef.current.api.reload();
     setState(function (old) {
       return Object.assign(Object.assign({}, old), {
         forceKey: Date.now()
@@ -63,19 +69,20 @@ function FrontendPlayer(_a) {
   };
 
   return /*#__PURE__*/React.createElement(SinglePlayer, Object.assign({
-    ref: playerRef,
+    ref: playRef,
     url: url,
     type: "flv",
     reload: reload,
-    isLive: false,
+    isLive: true,
     onCanPlayerInit: function onCanPlayerInit() {
-      return setState(function (old) {
-        return Object.assign(Object.assign({}, old), {
-          forceKey: Date.now()
-        });
+      setState({
+        forceKey: Date.now()
+      });
+      _onCanPlayerInit && _onCanPlayerInit({
+        reload: reload
       });
     },
-    customTimeLine: api && event ? /*#__PURE__*/React.createElement(FrontendTimeLine, {
+    customTimeLine: api && event && (customTimeLine || /*#__PURE__*/React.createElement(FrontendTimeLine, {
       end: endTemp,
       onSeek: onSeek,
       key: state.forceKey,
@@ -83,7 +90,7 @@ function FrontendPlayer(_a) {
       api: api,
       event: event,
       duration: duration
-    }) : /*#__PURE__*/React.createElement(React.Fragment, null)
+    }))
   }, props));
 }
 

package/es/Player/frontend_timeline.d.ts

@@ -8,7 +8,7 @@ interface ITimeLineProps {
     duration: number;
     begin: number;
     end: number;
-    onSeek(time: number): void;
+    onSeek?: (time: number) => void;
 }
 declare function FrontendTimeLine({ api, event, duration, begin, end, onSeek }: ITimeLineProps): JSX.Element;
 export default FrontendTimeLine;

package/es/Player/frontend_timeline.js

@@ -13,7 +13,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useCallback, useEffect, useMemo, useState, startTransition } from 'react';
 import useBarStatus from './contraller_bar/useBarStatus';
 import { useTimes } from './timeline';
-import { dateFormat } from './util';
+import { FMT } from './util';
+import moment from 'moment';
 import "./style/timeline.css";
 
 function FrontendTimeLine(_ref) {
@@ -52,7 +53,7 @@ function FrontendTimeLine(_ref) {
   }, [begin]);
   var playPercent = useMemo(function () {
     return rTime / duration * 100;
-  }, [rTime]);
+  }, [duration, rTime]);
   var cTime = useMemo(function () {
     return begin + rTime * 1000;
   }, [begin, rTime]);
@@ -67,7 +68,7 @@ function FrontendTimeLine(_ref) {
         time: cTime - currentTime
       });
     });
-  }, [api, duration, begin, onSeek, currentTime]);
+  }, [duration, begin, onSeek, currentTime]);
   var onLineMouseOver = useCallback(function (e) {
     var rect = e.currentTarget.getBoundingClientRect();
     var left = e.pageX - rect.left;
@@ -78,7 +79,7 @@ function FrontendTimeLine(_ref) {
         markTime: begin + mTime * 1000
       });
     });
-  }, [begin]);
+  }, [begin, duration]);
   var onLineMouseOut = useCallback(function (e) {
     startTransition(function () {
       return setState(function (old) {
@@ -132,7 +133,7 @@ function TipTitle(_ref2) {
     style: {
       fontWeight: 600
     }
-  }, "\u5F55\u50CF\u4FE1\u606F"), /*#__PURE__*/React.createElement("div", null, "\u5F00\u59CB\uFF1A", dateFormat(begin)), /*#__PURE__*/React.createElement("div", null, "\u7ED3\u675F\uFF1A", dateFormat(end)), /*#__PURE__*/React.createElement("div", null, "\u523B\u5EA6\uFF1A", dateFormat(markTime)), /*#__PURE__*/React.createElement("div", null, "\u5F53\u524D\uFF1A", dateFormat(current)));
+  }, "\u5F55\u50CF\u4FE1\u606F"), /*#__PURE__*/React.createElement("div", null, "\u5F00\u59CB\uFF1A", moment(begin).format(FMT)), /*#__PURE__*/React.createElement("div", null, "\u7ED3\u675F\uFF1A", moment(end).format(FMT)), /*#__PURE__*/React.createElement("div", null, "\u523B\u5EA6\uFF1A", moment(markTime).format(FMT)), /*#__PURE__*/React.createElement("div", null, "\u5F53\u524D\uFF1A", moment(current).format(FMT)));
 }
 
 export default FrontendTimeLine;

package/es/Player/live_heart.js

@@ -1,21 +1,41 @@
-import React, { useEffect } from 'react';
+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 BrowserTab from './event/browserTabEvent';
 
 function LiveHeart(_ref) {
   var api = _ref.api;
-  useEffect(function () {
-    var browserTabChange = function browserTabChange() {
-      if (BrowserTab.visibilityState() !== 'visible') {
-        return;
-      }
 
-      var current = api.getCurrentTime();
-      var buffered = api.getSecondsLoaded();
+  var _useState = useState(Date.now()),
+      _useState2 = _slicedToArray(_useState, 2),
+      runDep = _useState2[0],
+      setRundep = _useState2[1];
 
-      if (buffered - current > 5) {
-        console.warn("\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);
-      }
+  var run = function run() {
+    var current = api.getCurrentTime();
+    var buffered = api.getSecondsLoaded();
+
+    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);
+    }
+  };
+
+  useEffect(function () {
+    var browserTabChange = function browserTabChange() {
+      BrowserTab.visibilityState() === 'visible' && run();
     };
 
     BrowserTab.addEventListener(browserTabChange);
@@ -23,6 +43,19 @@ function LiveHeart(_ref) {
       BrowserTab.removeEventListener(browserTabChange);
     };
   }, [api]);
+
+  _useUpdateEffect(function () {
+    run();
+  }, [runDep]);
+
+  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/Player/message.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, { useEffect, useState, useMemo } from 'react';
+import React, { useEffect, useState, useMemo, useRef } from 'react';
 import IconFont from './iconfont';
 import EventName from './event/eventName';
 import "./style/message.css";
@@ -28,28 +28,35 @@ function VideoMessage(_ref) {
       state = _useState2[0],
       setState = _useState2[1];
 
+  var timeRef = useRef(null);
   var message = useMemo(function () {
     if (state.status === 'fail') {
-      return '视频错误';
+      console.warn("\u89C6\u9891\u9519\u8BEF\uFF0C\u8BF7\u624B\u52A8\u5237\u65B0\u91CD\u8BD5\uFF01");
+      return '请稍后重试！';
     }
 
     if (state.status === 'reload') {
-      return "\u89C6\u9891\u52A0\u8F7D\u5931\u8D25\uFF0C\u6B63\u5728\u8FDB\u884C\u91CD\u8FDE\u7B2C".concat(state.errorTimer, "\u6B21\u91CD\u8FDE");
+      console.warn("\u7B2C".concat(state.errorTimer, "\u6B21\u91CD\u8FDE"));
+      return "\u6B63\u5728\u5237\u65B0...";
     }
 
     return '';
   }, [state.errorTimer, state.status]);
   useEffect(function () {
     var openLoading = function openLoading() {
-      return setState(function (old) {
-        return Object.assign(Object.assign({}, old), {
-          loading: true
+      clearTimeout(timeRef.current);
+      timeRef.current = setTimeout(function () {
+        return setState(function (old) {
+          return Object.assign(Object.assign({}, old), {
+            loading: true
+          });
         });
-      });
+      }, 200);
     };
 
     var closeLoading = function closeLoading() {
-      return setState(function (old) {
+      clearTimeout(timeRef.current);
+      setState(function (old) {
         return Object.assign(Object.assign({}, old), {
           loading: false
         });
@@ -57,7 +64,8 @@ function VideoMessage(_ref) {
     };
 
     var errorReload = function errorReload(timer) {
-      return setState(function () {
+      clearTimeout(timeRef.current);
+      setState(function () {
         return {
           status: 'reload',
           errorTimer: timer,
@@ -85,18 +93,21 @@ function VideoMessage(_ref) {
     var reload = function reload() {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {
-          status: 'reload'
+          status: 'reload',
+          loading: true
         });
       });
     };
 
     var playEnd = function playEnd() {
-      return setState(function (old) {
+      clearTimeout(timeRef.current);
+      setState(function (old) {
         return Object.assign(Object.assign({}, old), {
           status: null,
           loading: false
         });
-      }), api.pause();
+      });
+      api.pause();
     };
 
     event.addEventListener('loadstart', openLoading);

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

@@ -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."); }
@@ -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,