@cloud-app-dev/vidc 3.0.17 → 3.0.19

package/.umirc.ts

@@ -2,7 +2,7 @@ import { defineConfig } from 'dumi';
 import path from 'path';
 
 const token =
-  'eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NSIsImV4dCI6MTY2MjI1ODMwNzUxNSwidWlkIjoiMTAxMDAwMDAwNjk5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTA1MTgsMTAwMDAwMTEwNzI4XSwidmFsaWRUaW1lIjoxNzA0MzgzOTk5MDAwLCJvcHRDZW50ZXJJZCI6IjEwMDEwMDAwMDIzMyIsInVzZXJUeXBlIjoxMDA3MDQsImlhdCI6MTY2MTk5OTEwNzUxNX0.uk_G3vqBCFqxQM2jbV6CSN-z9YNVt_cx5nWXkSuCOIA';
+  'eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NSIsImV4dCI6MTY2MzQwNTM5ODYzOCwidWlkIjoiMTAxMDAwMDAwNjk5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTA1MTgsMTAwMDAwMTEwNzI4XSwidmFsaWRUaW1lIjoxNzA0MzgzOTk5MDAwLCJvcHRDZW50ZXJJZCI6IjEwMDEwMDAwMDIzMyIsInVzZXJUeXBlIjoxMDA3MDQsImlhdCI6MTY2MzE0NjE5ODYzOH0.EPh_1eNPNFl-fmLODbHo0mu5R_1kKdt3UUu_0qfBGFY';
 
 export default defineConfig({
   title: 'CloudApp VIDC',

package/es/CustomRenderSelect/index.d.ts

@@ -6,5 +6,5 @@ interface ICustomRenderSelectProps extends SelectProps {
     value: any;
     customRender: (value: any) => JSX.Element;
 }
-declare function CustomRenderSelect({ children, value, customRender, dropdownClassName, getPopupContainer, ...props }: ICustomRenderSelectProps): JSX.Element;
+declare function CustomRenderSelect({ children, value, customRender, popupClassName, getPopupContainer, ...props }: ICustomRenderSelectProps): JSX.Element;
 export default CustomRenderSelect;

package/es/CustomRenderSelect/index.js

@@ -24,9 +24,9 @@ function CustomRenderSelect(_a) {
   var children = _a.children,
       value = _a.value,
       customRender = _a.customRender,
-      dropdownClassName = _a.dropdownClassName,
+      popupClassName = _a.popupClassName,
       getPopupContainer = _a.getPopupContainer,
-      props = __rest(_a, ["children", "value", "customRender", "dropdownClassName", "getPopupContainer"]);
+      props = __rest(_a, ["children", "value", "customRender", "popupClassName", "getPopupContainer"]);
 
   var classname = useMemo(function () {
     return "custom-render-select-dropdown-".concat(_uuid());
@@ -57,7 +57,7 @@ function CustomRenderSelect(_a) {
     ref: domRef
   }, /*#__PURE__*/React.createElement(_Select, Object.assign({}, props, {
     value: value,
-    dropdownClassName: "custom-render-select-dropdown ".concat(classname, " ").concat(dropdownClassName),
+    popupClassName: "custom-render-select-dropdown ".concat(classname, " ").concat(popupClassName),
     getPopupContainer: getPopupContainer ? getPopupContainer : function () {
       return domRef.current.parentElement.parentElement;
     },

package/es/LoaderScript/utils.js

@@ -26,6 +26,7 @@ if (!global._LOADER_SCRIPT_URL) {
 }
 
 export var loadScript = function loadScript(url) {
+  console.log(url);
   return new Promise(function (resolve, reject) {
     if (global._LOADER_SCRIPT_URL[url]) {
       resolve(null);

package/es/Map/LevelCenter/DragMarker/index.d.ts

@@ -1,11 +1,8 @@
 /// <reference types="react" />
-import { LatLng } from '../../interface';
 export interface IDragMarkerProps {
     center?: [number, number];
-    zoom?: number;
     onChange?: (options: {
-        center: [number, number] | LatLng;
-        zoom: number;
+        center: [number, number];
     }) => void;
 }
 declare function DragMarker({ center, onChange }: IDragMarkerProps): JSX.Element;

package/es/Map/LevelCenter/DragMarker/index.js

@@ -29,16 +29,13 @@ function DragMarker(_ref) {
       var latlng = type.leaflet ? e.target.getLatLng() : e.target.getPosition();
       instance.setCenter(latlng);
       onChange === null || onChange === void 0 ? void 0 : onChange({
-        center: latlng,
-        zoom: instance.getZoom()
+        center: latlng
       });
     });
     instance.map.on('zoomend', function (e) {
-      var zoom = e.target.getZoom();
       var latlng = type.leaflet ? marker.getLatLng() : marker.getPosition();
       onChange === null || onChange === void 0 ? void 0 : onChange({
-        center: latlng,
-        zoom: zoom
+        center: [latlng.getLng(), latlng.getLat()]
       });
     }); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [marker]);

package/es/Map/LevelCenter/index.js

@@ -48,14 +48,25 @@ function LevelCenter(_ref) {
       });
     }
   });
+  useMapEvent('zoomed', function (event) {
+    onLevelCenterChange === null || onLevelCenterChange === void 0 ? void 0 : onLevelCenterChange({
+      center: defaultCenter,
+      zoom: event.target.getZoom()
+    });
+  });
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ClusterLayer, {
     points: points
   }), /*#__PURE__*/React.createElement(ResetTools, {
     onMapReset: mapRest
   }), /*#__PURE__*/React.createElement(DragMarker, {
     center: defaultCenter,
-    zoom: defaultZoom,
-    onChange: onLevelCenterChange
+    onChange: function onChange(_ref2) {
+      var center = _ref2.center;
+      return onLevelCenterChange === null || onLevelCenterChange === void 0 ? void 0 : onLevelCenterChange({
+        center: center,
+        zoom: defaultZoom
+      });
+    }
   }), children);
 }
 

package/es/Map/SinglePoint/index.d.ts

@@ -1,7 +1,14 @@
+import React from 'react';
 import { MapPoint } from '../interface';
 import './index.less';
-export interface ISinglePoint {
-    point: MapPoint;
+export interface ISinglePlayerProps {
+    center?: [number, number];
+    points: MapPoint[];
+    enableClick?: boolean;
+    onCenterChange?: (options: {
+        center: [number, number];
+    }) => void;
+    children?: React.ReactNode;
 }
-declare const _default: (props: ISinglePoint) => JSX.Element;
+declare const _default: (props: ISinglePlayerProps) => JSX.Element;
 export default _default;

package/es/Map/SinglePoint/index.js

@@ -1,35 +1,57 @@
 import _useMount from "ahooks/es/useMount";
-import React, { useCallback, useContext, useMemo } from 'react';
+import React, { useCallback, useContext } from 'react';
+import ClusterLayer from '../ClusterLayer';
 import ResetTools from '../ResetTools';
-import Marker from './Marker';
+import DragMarker from '../LevelCenter/DragMarker';
 import withMap from '../withMap';
 import { mapContext } from '../Context';
-import useMapType from '../hook/useMapType';
+import useMapEvent from '../hook/useMapEvent';
 import "./index.css";
 
 function SinglePoint(_ref) {
-  var point = _ref.point;
+  var center = _ref.center,
+      points = _ref.points,
+      onCenterChange = _ref.onCenterChange,
+      enableClick = _ref.enableClick,
+      children = _ref.children;
 
   var _useContext = useContext(mapContext),
       instance = _useContext.instance;
 
-  var type = useMapType();
-  var defaultCenter = useMemo(function () {
-    return type.AMap ? [point.longitude, point.latitude] : [point.latitude, point.longitude];
-  }, [type.AMap, point.longitude, point.latitude]);
   var mapRest = useCallback(function () {
-    return instance.setZoomAndCenter(instance.config.zoom, defaultCenter);
-  }, [defaultCenter, instance]);
+    return instance.setZoomAndCenter(instance.config.zoom, instance.config.center);
+  }, [instance]);
 
   _useMount(function () {
-    return mapRest();
+    if (enableClick) {
+      instance.setCursor('pointer');
+    }
+
+    mapRest();
   });
 
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ResetTools, {
+  useMapEvent('click', function (event) {
+    if (enableClick) {
+      var _center = [event.lnglat.lng, event.lnglat.lat];
+      instance.setCenter(_center);
+      onCenterChange === null || onCenterChange === void 0 ? void 0 : onCenterChange({
+        center: _center
+      });
+    }
+  });
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ClusterLayer, {
+    points: points
+  }), /*#__PURE__*/React.createElement(ResetTools, {
     onMapReset: mapRest
-  }), /*#__PURE__*/React.createElement(Marker, {
-    point: point
-  }));
+  }), /*#__PURE__*/React.createElement(DragMarker, {
+    center: center,
+    onChange: function onChange(_ref2) {
+      var center = _ref2.center;
+      return onCenterChange === null || onCenterChange === void 0 ? void 0 : onCenterChange({
+        center: center
+      });
+    }
+  }), children);
 }
 
 export default withMap(SinglePoint, 'single-point-map-container');

package/es/Map/hook/useMapEvent.js

@@ -1,22 +1,23 @@
-import _useCreation from "ahooks/es/useCreation";
+import _useLatest from "ahooks/es/useLatest";
 import { useContext, useEffect } from 'react';
 import { mapContext } from '../Context';
 
 function useMapEvent(type, fn) {
-  var action = _useCreation(function () {
-    return fn;
-  }, []);
+  var fnRef = _useLatest(fn);
 
   var _useContext = useContext(mapContext),
       instance = _useContext.instance;
 
   useEffect(function () {
-    console.log(11111);
-    instance.on(type, action);
+    var eventAction = function eventAction(event) {
+      fnRef.current(event);
+    };
+
+    instance.on(type, eventAction);
     return function () {
-      return instance.off(type, action);
+      return instance.off(type, eventAction);
     }; // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [instance, type]);
 }
 
 export default useMapEvent;

package/es/Map/index.d.ts

@@ -16,7 +16,7 @@ declare const Map: {
     LoaderMap: typeof LoaderMap;
     BasicMap: typeof BasicMap;
     ResetTools: typeof ResetTools;
-    SinglePoint: (props: import("./SinglePoint").ISinglePoint) => JSX.Element;
+    SinglePoint: (props: import("./SinglePoint").ISinglePlayerProps) => JSX.Element;
     useMarker: typeof useMarker;
     withMap: typeof withMap;
 };

package/es/Player/api/index.d.ts

@@ -7,12 +7,15 @@ declare class Api {
     get video(): HTMLVideoElement;
     play: () => void;
     pause: () => void;
+    get paused(): boolean;
+    get muted(): boolean;
     /**
      * 设置currentTime实现seek
      * @param {*} seconds
      */
     seekTo: (seconds: number) => void;
     setVolume: (fraction: number) => void;
+    getVolume: () => number;
     mute: () => void;
     unmute: () => void;
     /**
@@ -51,7 +54,8 @@ declare class Api {
     unload: () => void;
     reload: () => void;
     toggleFit: () => void;
-    setIndex: (i: number) => void;
+    openFpsPlay: () => void;
+    closeFpsPlay: () => void;
     destroy: () => void;
 }
 export declare type TypeAndPlay = {

package/es/Player/api/index.js

@@ -50,6 +50,10 @@ var Api = /*#__PURE__*/function () {
       _this.video.volume = fraction;
     };
 
+    this.getVolume = function () {
+      return _this.video.volume;
+    };
+
     this.mute = function () {
       _this.video.muted = true;
     };
@@ -164,7 +168,9 @@ var Api = /*#__PURE__*/function () {
 
     this.toggleFit = function () {};
 
-    this.setIndex = function (i) {};
+    this.openFpsPlay = function () {};
+
+    this.closeFpsPlay = function () {};
 
     this.destroy = function () {
       _this.container = null;
@@ -178,6 +184,16 @@ var Api = /*#__PURE__*/function () {
     get: function get() {
       return this.container.querySelector('video');
     }
+  }, {
+    key: "paused",
+    get: function get() {
+      return this.video.paused;
+    }
+  }, {
+    key: "muted",
+    get: function get() {
+      return this.video.muted;
+    }
   }]);
 
   return Api;
@@ -195,37 +211,33 @@ export function useTypeAndPlay(url, type, isLive, container, segments, flvConfig
       setState = _useState2[1];
 
   useEffect(function () {
-    if (!container) {
+    var isReady = container && (url || type === 'flv' && segments);
+
+    if (!isReady) {
       return undefined;
     }
 
     var video = container.querySelector('video');
     var options = {};
 
-    if (type === 'flv') {
-      if (!(url || segments)) {
-        return undefined;
-      }
-
-      options.type = 'flv';
-      options.flv = createFlvPlayer(video, url, isLive, flvConfig);
-    }
-
-    if (type === 'hls') {
-      if (!url) {
-        return undefined;
-      }
-
-      options.type = 'hls';
-      options.hls = createHlsPlayer(video, url, hlsConfig);
-    }
-
-    if (url && type === 'native') {
-      options.type = 'native';
-      video.setAttribute('src', url);
+    switch (type) {
+      case 'flv':
+        options.type = 'flv';
+        options.flv = createFlvPlayer(video, url, isLive, flvConfig);
+        break;
+
+      case 'hls':
+        options.type = 'hls';
+        options.hls = createHlsPlayer(video, url, isLive, hlsConfig);
+        break;
+
+      default:
+        options.type = 'native';
+        video.setAttribute('src', url);
+        break;
     }
 
-    url && video.paused && tryCatch(function () {
+    video.paused && tryCatch(function () {
       return video.play();
     });
     setState(options);

package/es/Player/context.d.ts

@@ -0,0 +1,21 @@
+import React from 'react';
+import type Api from './api';
+import type VideoEventInstance from './event';
+export interface IPlayerContextProps {
+    /**
+     * @description 用于获取微应用顶层的dom节点
+     */
+    container: HTMLElement;
+    api: Api;
+    event: VideoEventInstance;
+    isLive: boolean;
+    isFpsPlay: boolean;
+    children: React.ReactNode;
+}
+export declare const Context: React.Context<Omit<IPlayerContextProps, "children">>;
+export declare function Provider({ children, ...props }: IPlayerContextProps): JSX.Element;
+export declare namespace Provider {
+    var defaultProps: {
+        getContainer: () => HTMLElement;
+    };
+}

package/es/Player/context.js

@@ -0,0 +1,16 @@
+import { __rest } from "tslib";
+import React from 'react';
+export var Context = /*#__PURE__*/React.createContext(null);
+export function Provider(_a) {
+  var children = _a.children,
+      props = __rest(_a, ["children"]);
+
+  return /*#__PURE__*/React.createElement(Context.Provider, {
+    value: Object.assign({}, props)
+  }, children);
+}
+Provider.defaultProps = {
+  getContainer: function getContainer() {
+    return document.body;
+  }
+};

package/es/Player/contraller_bar/contraller_event.d.ts

@@ -1,9 +1,6 @@
 import React from 'react';
-import VideoEventInstance from '../event';
 interface IContrallerEventProps {
-    event?: VideoEventInstance;
-    container?: HTMLElement;
     children?: React.ReactNode;
 }
-declare function ContrallerEvent({ event, container, children }: IContrallerEventProps): JSX.Element;
+declare function ContrallerEvent({ children }: IContrallerEventProps): JSX.Element;
 export default ContrallerEvent;

package/es/Player/contraller_bar/contraller_event.js

@@ -1,3 +1,6 @@
+import _useEventListener from "ahooks/es/useEventListener";
+import _useMount from "ahooks/es/useMount";
+
 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."); }
@@ -10,13 +13,17 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useEffect, useState, useRef } from 'react';
+import React, { useState, useRef, useContext } from 'react';
+import { Context } from '../context';
 import EventName from '../event/eventName';
 
 function ContrallerEvent(_ref) {
-  var event = _ref.event,
-      container = _ref.container,
-      children = _ref.children;
+  var children = _ref.children;
+
+  var _useContext = useContext(Context),
+      event = _useContext.event,
+      container = _useContext.container;
+
   var timer = useRef(null);
 
   var _useState = useState(true),
@@ -24,30 +31,32 @@ function ContrallerEvent(_ref) {
       visibel = _useState2[0],
       setVisibel = _useState2[1];
 
-  useEffect(function () {
-    var showContraller = function showContraller() {
-      clearTimeout(timer.current);
-      setVisibel(true);
-      event.emit(EventName.SHOW_CONTRALLER);
-    };
-
-    var hideContraller = function hideContraller() {
-      clearTimeout(timer.current);
-      timer.current = setTimeout(function () {
-        setVisibel(false);
-        event.emit(EventName.HIDE_CONTRALLER);
-      }, 3 * 1000);
-    }; // 默认执行延时hide
-
-
-    hideContraller();
-    container.addEventListener('mouseenter', showContraller, false);
-    container.addEventListener('mouseleave', hideContraller, false);
-    return function () {
-      container.removeEventListener('mouseenter', showContraller, false);
-      container.removeEventListener('mouseleave', hideContraller, false);
-    };
-  }, [container, event]);
+  var showContraller = function showContraller() {
+    clearTimeout(timer.current);
+    setVisibel(true);
+    event.emit(EventName.SHOW_CONTRALLER);
+  };
+
+  var hideContraller = function hideContraller() {
+    clearTimeout(timer.current);
+    timer.current = setTimeout(function () {
+      setVisibel(false);
+      event.emit(EventName.HIDE_CONTRALLER);
+    }, 3 * 1000);
+  };
+
+  _useMount(function () {
+    return hideContraller();
+  });
+
+  _useEventListener('mouseenter', showContraller, {
+    target: container
+  });
+
+  _useEventListener('mouseleave', hideContraller, {
+    target: container
+  });
+
   return /*#__PURE__*/React.createElement(React.Fragment, null, React.Children.map(children, function (child) {
     return /*#__PURE__*/React.isValidElement(child) ? /*#__PURE__*/React.cloneElement(child, {
       visibel: visibel

package/es/Player/contraller_bar/index.d.ts

@@ -1,19 +1,14 @@
 import React from 'react';
-import type Api from '../api';
-import type VideoEventInstance from '../event';
 import '../style/bar.less';
 interface IContrallerBarProps {
-    container?: HTMLElement;
     rightExtContents: React.ReactNode;
     rightMidExtContents: React.ReactNode;
     visibel?: boolean;
-    api: Api;
-    event: VideoEventInstance;
-    isLive?: boolean;
     leftExtContents: React.ReactNode;
     leftMidExtContents: React.ReactNode;
     reload: () => void;
     hideTimeProgress?: boolean;
+    oneFpsPlay?: boolean;
 }
-declare function ContrallerBar({ container, rightExtContents, rightMidExtContents, visibel, api, event, isLive, leftExtContents, leftMidExtContents, reload, hideTimeProgress, }: IContrallerBarProps): JSX.Element;
+declare function ContrallerBar({ rightExtContents, rightMidExtContents, visibel, leftExtContents, leftMidExtContents, reload, hideTimeProgress, oneFpsPlay, }: IContrallerBarProps): JSX.Element;
 export default ContrallerBar;

package/es/Player/contraller_bar/index.js

@@ -4,31 +4,23 @@ import RightBar from './right_bar';
 import "../style/bar.css";
 
 function ContrallerBar(_ref) {
-  var container = _ref.container,
-      rightExtContents = _ref.rightExtContents,
+  var rightExtContents = _ref.rightExtContents,
       rightMidExtContents = _ref.rightMidExtContents,
       visibel = _ref.visibel,
-      api = _ref.api,
-      event = _ref.event,
-      isLive = _ref.isLive,
       leftExtContents = _ref.leftExtContents,
       leftMidExtContents = _ref.leftMidExtContents,
       reload = _ref.reload,
-      hideTimeProgress = _ref.hideTimeProgress;
+      hideTimeProgress = _ref.hideTimeProgress,
+      oneFpsPlay = _ref.oneFpsPlay;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "contraller-bar-layout ".concat(!visibel ? 'hide-contraller-bar' : '')
   }, /*#__PURE__*/React.createElement(LeftBar, {
+    oneFpsPlay: oneFpsPlay,
     hideTimeProgress: hideTimeProgress,
-    api: api,
     reload: reload,
-    event: event,
-    container: container,
-    isLive: isLive,
     leftMidExtContents: leftMidExtContents,
     leftExtContents: leftExtContents
   }), /*#__PURE__*/React.createElement(RightBar, {
-    api: api,
-    container: container,
     rightExtContents: rightExtContents,
     rightMidExtContents: rightMidExtContents
   })));

package/es/Player/contraller_bar/left_bar.d.ts

@@ -1,15 +1,10 @@
 import React from 'react';
-import Api from '../api';
-import VideoEventInstance from '../event';
 interface ILeftBarProps {
-    api: Api;
-    event: VideoEventInstance;
-    container: HTMLElement;
-    isLive: boolean;
     leftExtContents?: React.ReactNode;
     leftMidExtContents?: React.ReactNode;
     reload: () => void;
     hideTimeProgress?: boolean;
+    oneFpsPlay?: boolean;
 }
-declare function LeftBar({ api, event, container, isLive, reload, leftExtContents, leftMidExtContents, hideTimeProgress }: ILeftBarProps): JSX.Element;
+declare function LeftBar({ reload, leftExtContents, leftMidExtContents, hideTimeProgress, oneFpsPlay }: ILeftBarProps): JSX.Element;
 export default LeftBar;