@realsee/vreo 1.0.0-alpha.2 → 1.0.0-alpha.20

package/CHANGELOG.md

@@ -1,9 +1,14 @@
 # CHANGELOG
+#1.0.0-alpha.19
+- fix: 多段BgMusic可以重复播放
+
+#1.0.0-alpha.18
+- fix: 修复无音频版本中途播放会从头开始的问题
+
 #1.0.0-alpha.1
 - feat: css样式适配: 手机横竖屏, pad, pc
 - feat: 新增两种波浪风格: 'wave' | 'solid'
 - feat: 标签调用dna插件
-- fix: 修复无音频版本中途播放会从头开始的问题
 - fix: 图片/视频 弹窗UI问题
 
 #0.2.0-alpha.25

package/README.md

@@ -15,20 +15,36 @@
 
 ## 安装说明
 
-推荐使用 `npm` 或 `yarn` 的方式进行安装。由于 `@realsee/vreo` 依赖 [Five](https://unpkg.com/@realsee/five/docs/index.html) 和 [React](https://reactjs.org/) ，请务必同时安装相关依赖：
-
-```bash
-$ npm install @realsee/vreo @realsee/five react react-dom --save
-# or
-$ yarn add @realsee/vreo @realsee/five react react-dom
-```
+ - 由于 `@realsee/vreo` 依赖 [Five](https://unpkg.com/@realsee/five/docs/index.html) 和 [React](https://reactjs.org/) ，请务必同时安装相关依赖  
+ - 根据项目的包管理器来安装：
+    ``` bash
+    # pnpm
+    pnpm install @realsee/vreo @realsee/five react react-dom --save
+    # npm
+    npm install @realsee/vreo @realsee/five react react-dom --save
+    # yarn
+    yarn add @realsee/vreo @realsee/five react react-dom
+    ```
 
 ## 快速上手
+引入样式：
 
+```css
+  /* @file xxx.css */
+  @import '@realsee/vreo/stylesheets/default.css';
+```
+或
 ```jsx
+  /* @file xxx.tsx | xxx.jsx */
+  import '@realsee/vreo/stylesheets/default.css';
+```
+examples:
+```tsx
+/* @file index.tsx | index.jsx */
 import * as React from 'react'
 import { Five } from '@realsee/five'
 import { Player } from '@realsee/vreo'
+import '@realsee/vreo/stylesheets/default.css';
 
 // 创建 Five 实例
 const five = new Five({
@@ -36,32 +52,28 @@ const five = new Five({
 })
 
 // 创建 Player 实例
-const vreoplayer = new Player(five)
+const vreoPlayer = new Player(five)
 
 // 异步请求剧本数据
 const vreoUnit = await fetch('api/**/**')
 
 // 加载剧本数据（剧本数据见下文）
-vreoplayer.load(vreoUnit)
+vreoPlayer.load(vreoUnit)
 
 // 播放
-vreoplayer.play()
+vreoPlayer.play()
 
 // 暂停
-vreoplayer.pause()
-```
-
-引入样式：
-
-```css
-@import '@realsee/vreo/stylesheets/default.css';
+vreoPlayer.pause()
 ```
 
 ## React Context & Hooks 模式使用
 
 **Vreo** 支持 [React Context](https://reactjs.org/docs/context.html) 与 [Hooks](https://reactjs.org/docs/hooks-intro.html) 相配合的模式使用，简单样例如下：
 
-```jsx
+```tsx
+/* @file App.tsx */
+
 import * as React from 'react'
 import * as ReactDOM from 'react-dom'
 import { Five, Work, parseWork } from '@realsee/five'
@@ -78,20 +90,21 @@ const PlayButton: React.FC = () => {
   const { load, play, pause } = useVreoAction()
 
   return (
-    <button
-      onClick={async () => {
-        // 获取讲房数据
-        const vreoUnit = await fetch('api/**/**')
-        // 载入数据
-        await load(vreoUnit)
-        // 播放
-        play()
-        // 暂停
-        pause()
-      }}
-    >
-      讲解
-    </button>
+    <>
+      <button
+        onClick={async () => {
+          // 获取讲房数据
+          const vreoUnit = await fetch('api/**/**')
+          // 载入数据
+          await load(vreoUnit)
+          // 播放
+          play()
+        }}
+      >
+        讲解
+      </button>
+      <button onClick={() => pause()}>暂停</button>
+    </>
   )
 }
 
@@ -559,7 +572,4 @@ vreoplayer.load(vreoUnit, 0, true)
 
 ```
 
-
-## API 文档
-
-详细的 API 文档请参考：[Vreo API](https://realsee.js.org/vreo/index.html) 。
+Enjoy it!

package/lib/PlayController/index.js

@@ -102,7 +102,7 @@ var PlayController = /*#__PURE__*/function (_Subscribe) {
         if (keyframe.parsed) return;
         keyframe.parsed = true;
 
-        _this.emit(keyframe.type, keyframe);
+        _this.emit(keyframe.type, keyframe, _this.currentTime);
       });
     });
     return _this;

package/lib/Player/Controller.d.ts

@@ -15,7 +15,7 @@ export declare class Controller extends Subscribe<VreoKeyframeEvent> {
     playing: boolean;
     ended: boolean;
     loading: boolean | null;
-    containerSize?: {
+    containerSize: {
         width: number;
         height: number;
     };
@@ -23,7 +23,7 @@ export declare class Controller extends Subscribe<VreoKeyframeEvent> {
     container: Element;
     waveAppearance: WaveAppearance | null;
     appearance: Appearance;
-    avatar?: VreoVideo['avatar'];
+    avatar: VreoVideo['avatar'];
     visible: boolean;
     get agentType(): "none" | "video" | "avatar";
     popUp: string | JSX.Element | null;
@@ -51,11 +51,11 @@ export declare class Controller extends Subscribe<VreoKeyframeEvent> {
     get ready(): boolean;
     get currentTime(): number;
     get currentKeyframes(): VreoKeyframe[];
-    get mediaInstance(): HTMLVideoElement | HTMLAudioElement | import("../shared-utils/AduioLike").AudioLike | undefined;
+    get mediaInstance(): HTMLVideoElement | HTMLAudioElement | import("../shared-utils/AudioLike").AudioLike | undefined;
     /**
      * 逐帧任务
      */
-    requestAnimationFrameLoop(callback: (type: VreoKeyframeEnum, keyframe: VreoKeyframe) => void): void;
+    requestAnimationFrameLoop(callback: (type: VreoKeyframeEnum, keyframe: VreoKeyframe, currentTime: number) => void): void;
     run(callback: (type: VreoKeyframeEnum, keyframe: VreoKeyframe) => void): void;
     dispose(): void;
 }

package/lib/Player/Controller.js

@@ -88,12 +88,19 @@ var Controller = /*#__PURE__*/function (_Subscribe) {
 
     _defineProperty(_assertThisInitialized(_this), "loading", false);
 
+    _defineProperty(_assertThisInitialized(_this), "containerSize", {
+      width: 0,
+      height: 0
+    });
+
     _defineProperty(_assertThisInitialized(_this), "waveAppearance", null);
 
     _defineProperty(_assertThisInitialized(_this), "appearance", {
-      waveStyle: 'solid'
+      waveStyle: 'wave'
     });
 
+    _defineProperty(_assertThisInitialized(_this), "avatar", {});
+
     _defineProperty(_assertThisInitialized(_this), "visible", false);
 
     _defineProperty(_assertThisInitialized(_this), "popUp", null);
@@ -111,6 +118,7 @@ var Controller = /*#__PURE__*/function (_Subscribe) {
       playing: _mobx.observable,
       setPlaying: _mobx.action,
       loading: _mobx.observable,
+      // videoAgentScene: observable.ref,
       setLoading: _mobx.action,
       popUp: _mobx.observable.ref,
       openPopUp: _mobx.action,
@@ -168,7 +176,7 @@ var Controller = /*#__PURE__*/function (_Subscribe) {
       (0, _mobx.reaction)(function () {
         return _this.containerSize;
       }, function (containerSize) {
-        if (!containerSize) return;
+        if (!(containerSize !== null && containerSize !== void 0 && containerSize.width)) return;
         var width = containerSize.width;
         var height = containerSize.height;
 
@@ -219,7 +227,8 @@ var Controller = /*#__PURE__*/function (_Subscribe) {
 
   _createClass(Controller, [{
     key: "agentType",
-    get: function get() {
+    get: // null 表示加载失败
+    function get() {
       var _this$videoAgentScene, _this$avatar;
 
       var type = (0, _getMediaInfo.getMediaType)((_this$videoAgentScene = this.videoAgentScene) === null || _this$videoAgentScene === void 0 ? void 0 : _this$videoAgentScene.videoAgentMesh.videoUrl);
@@ -362,10 +371,10 @@ var Controller = /*#__PURE__*/function (_Subscribe) {
         if (keyframe.parsed) return;
         keyframe.parsed = true;
 
-        _this3.emit(keyframe.type, keyframe);
+        _this3.emit(keyframe.type, keyframe, _this3.currentTime);
 
         if (callback) {
-          callback(keyframe.type, keyframe);
+          callback(keyframe.type, keyframe, _this3.currentTime);
         }
       });
     }

package/lib/Player/index.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Player = void 0;
 
+var React = _interopRequireWildcard(require("react"));
+
 var ReactDOM = _interopRequireWildcard(require("react-dom"));
 
 var _five = require("@realsee/five");
@@ -251,7 +253,7 @@ var Player = /*#__PURE__*/function (_Subscribe) {
                 this.controller.setEnded(false);
                 this.play();
                 this.controller.run(function (type, keyframe) {
-                  return _this2.emit(type, keyframe);
+                  return _this2.emit(type, keyframe, _this2.controller.currentTime);
                 });
                 this.controller.setLoading(false);
                 return _context.abrupt("return", true);

package/lib/Player/modules/VideoAgent/VideoAgentMesh.d.ts

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import AudioLike from '../../../shared-utils/AduioLike';
+import AudioLike from '../../../shared-utils/AudioLike';
 export interface VideoAgentMeshOptions {
     /**
      * 自定义视频实例。
@@ -40,7 +40,7 @@ export declare class VideoAgentMesh extends THREE.Mesh {
     private update;
     play(videoUrl?: string, currentTime?: number, duration?: number): Promise<unknown>;
     /**
-     * 转成毫秒，保障精准度
+     * 秒转成毫秒，保障精准度
      */
     get currentTime(): number;
     dispose(): void;

package/lib/Player/modules/VideoAgent/VideoAgentMesh.js

@@ -13,7 +13,7 @@ var _Preloader = require("../../../shared-utils/Preloader");
 
 var _mobx = require("mobx");
 
-var _AduioLike = _interopRequireDefault(require("../../../shared-utils/AduioLike"));
+var _AudioLike = _interopRequireDefault(require("../../../shared-utils/AudioLike"));
 
 var _getMediaInfo = require("../../../shared-utils/getMediaInfo");
 
@@ -136,7 +136,7 @@ var VideoAgentMesh = /*#__PURE__*/function (_THREE$Mesh) {
       _this.audioInstance = options.audioInstance;
     }
 
-    _this.audioLikeInstance = new _AduioLike["default"]();
+    _this.audioLikeInstance = new _AudioLike["default"]();
     (0, _mobx.makeObservable)(_assertThisInitialized(_this), {
       paused: _mobx.observable
     });
@@ -409,7 +409,7 @@ var VideoAgentMesh = /*#__PURE__*/function (_THREE$Mesh) {
       return play;
     }()
     /**
-     * 转成毫秒，保障精准度
+     * 秒转成毫秒，保障精准度
      */
 
   }, {

package/lib/Player/modules/VideoAgent/index.js

@@ -36,7 +36,7 @@ function VideoAgent(props) {
 
     if (showAvatar) return false;
     return ((_controller$videoAgen = controller.videoAgentScene) === null || _controller$videoAgen === void 0 ? void 0 : _controller$videoAgen.videoAgentMesh.mediaInstance) instanceof HTMLVideoElement;
-  }, [controller.videoAgentScene]);
+  }, [controller.videoAgentScene, showAvatar]);
   React.useEffect(function () {
     if (!ref.current) throw new Error('React 渲染异常，请稍后重试 ...');
 

package/lib/Player/modules/Wave/index.js

@@ -1,51 +1,200 @@
 "use strict";
 
+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); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Wave = Wave;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+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; }
+
+var prefix = 'https://vr-public.realsee-cdn.cn/release/static/image/release/';
+var WAVES = {
+  single: {
+    width: 766,
+    height: 60,
+    frames: 20,
+    hevc: 'vapor/static/wave-single.140d197f4838c130b69e87dfd0705479.mov',
+    vp9: 'vapor/static/wave-single.eda65de390a830193fff40d1f1255555.webm',
+    png: 'vapor/static/wave-single.f51aade2a6e1c59211698a1a24e6135f.png'
+  },
+  "double": {
+    width: 766,
+    height: 60,
+    frames: 16,
+    hevc: 'vapor/static/wave-double.3e6d73050ee6958cc3060b107ebe5f39.mov',
+    vp9: '/vapor/static/wave-double.77dfe8548ebcb3f3d336785d4fe9c7b2.webm',
+    png: '/vapor/static/wave-double.ab4fe7d8a70395109ca4f759af7bd53f.png'
+  },
+  solid: {
+    width: 1126,
+    height: 90,
+    frames: 48,
+    hevc: 'vapor/static/wave-solid.cf68912a93275d07aa6b5097ea11fdda.mov',
+    vp9: 'vapor/static/wave-solid.64438b63cbb346906d066bb7b8dc3e20.webm',
+    png: 'vapor/static/wave-solid.6969d7f3f2f44f7ac1ade30e65660cb1.png'
+  },
+  swap: {
+    width: 2250,
+    height: 180,
+    frames: 41,
+    hevc: 'vapor/static/wave-swap.b38f22e2cf84ee21e9be35f7f56c9cfc.mov',
+    vp9: 'vapor/static/wave-swap.c02e4b94cf05aecf6e7a0023bc7bb90f.webm',
+    png: 'vapor/static/wave-swap.772ba526a7210dcc01567062c6319545.png'
+  },
+  expand: {
+    width: 2250,
+    height: 180,
+    frames: 45,
+    hevc: 'vapor/static/wave-expand.9529956c5954740cd4c9d07d51e32822.mov',
+    vp9: 'vapor/static/wave-expand.a0d2a0074001cd3d4fea56818c6d3c38.webm',
+    png: 'vapor/static/wave-expand.62fcf27b445533e6eb1b17bab5eafa0d.png'
+  }
+};
+var userAgent = typeof navigator !== 'undefined' ? navigator.userAgent : '';
+var isAppleDevice = /(iPhone|iPad|iPod)/i.test(userAgent);
+var isSafari = /safari/i.test(userAgent) && !/chrome/i.test(userAgent) && /version/i.test(userAgent);
+var isMicroMessenger = /microMessenger/i.test(userAgent);
+var canPlayHevc = isAppleDevice || isSafari;
+var canPlayVp9 = typeof MediaSource !== 'undefined' && MediaSource.isTypeSupported("video/webm; codecs=vp9");
 
 function Wave(props) {
-  var waveUrl = _react["default"].useMemo(function () {
+  var wave = _react["default"].useMemo(function () {
     var _props$appearance;
 
     var appearance = (_props$appearance = props === null || props === void 0 ? void 0 : props.appearance) !== null && _props$appearance !== void 0 ? _props$appearance : 'solid';
+    return WAVES[appearance];
+  }, [props === null || props === void 0 ? void 0 : props.appearance]);
 
-    switch (appearance) {
-      default:
-        return 'https://vr-public.realsee-cdn.cn/release/static/image/release/vapor/static/wave-solid.64438b63cbb346906d066bb7b8dc3e20.webm';
+  var heightWidthRatio = _react["default"].useMemo(function () {
+    return wave.height / wave.width;
+  }, [wave]);
 
-      case 'solid':
-        return 'https://vr-public.realsee-cdn.cn/release/static/image/release/vapor/static/wave-solid.64438b63cbb346906d066bb7b8dc3e20.webm';
+  var content = null;
+
+  if (isMicroMessenger) {
+    content = /*#__PURE__*/_react["default"].createElement(KeyframeWaveContent, {
+      wave: wave
+    });
+  } else if (canPlayHevc) {
+    content = /*#__PURE__*/_react["default"].createElement(VideoWaveContent, {
+      format: "hevc",
+      wave: wave
+    });
+  } else if (canPlayVp9) {
+    content = /*#__PURE__*/_react["default"].createElement(VideoWaveContent, {
+      format: "vp9",
+      wave: wave
+    });
+  } else {
+    content = /*#__PURE__*/_react["default"].createElement(KeyframeWaveContent, {
+      wave: wave
+    });
+  }
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "vreo-wave"
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      position: 'relative',
+      width: '100%',
+      paddingTop: "".concat(heightWidthRatio * 100, "%")
+    }
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      position: 'absolute',
+      width: '100%',
+      height: '100%',
+      left: 0,
+      top: 0
+    }
+  }, content)));
+}
 
-      case 'single':
-        return 'https://vr-public.realsee-cdn.cn/release/static/image/release/vapor/static/wave-single.eda65de390a830193fff40d1f1255555.webm';
+var VideoWaveContent = function VideoWaveContent(_ref) {
+  var wave = _ref.wave,
+      format = _ref.format;
+  var videoRef = (0, _react.useRef)(null);
 
-      case 'double':
-        return 'https://vr-public.realsee-cdn.cn/release/static/image/release/vapor/static/wave-double.77dfe8548ebcb3f3d336785d4fe9c7b2.webm';
+  var _useState = (0, _react.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      canPlay = _useState2[0],
+      setCanPlay = _useState2[1];
 
-      case 'swap':
-        return 'https://vr-public.realsee-cdn.cn/release/static/image/release/vapor/static/wave-swap.c02e4b94cf05aecf6e7a0023bc7bb90f.webm';
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      errored = _useState4[0],
+      setErrored = _useState4[1];
 
-      case 'expand':
-        return 'https://vr-public.realsee-cdn.cn/release/static/image/release/vapor/static/wave-expand.a0d2a0074001cd3d4fea56818c6d3c38.webm';
+  var source = prefix + wave[format];
+  (0, _react.useEffect)(function () {
+    setCanPlay(false);
+  }, [source]);
+  var canPlayHandler = (0, _react.useCallback)(function () {
+    if (videoRef.current) {
+      videoRef.current.play();
     }
-  }, [props === null || props === void 0 ? void 0 : props.appearance]);
+
+    setCanPlay(true);
+  }, []);
+  var errorHandler = (0, _react.useCallback)(function () {
+    setErrored(true);
+  }, []);
+
+  if (errored) {
+    return /*#__PURE__*/_react["default"].createElement(KeyframeWaveContent, {
+      wave: wave
+    });
+  }
 
   return /*#__PURE__*/_react["default"].createElement("video", {
-    className: "vreo-wave",
-    width: "100%",
+    style: {
+      opacity: canPlay ? 1 : 0
+    },
     preload: "auto",
-    muted: true,
+    ref: videoRef,
+    width: "100%",
+    height: "100%",
+    playsInline: true,
     autoPlay: true,
+    onCanPlay: canPlayHandler,
+    onError: errorHandler,
+    muted: true,
     loop: true,
-    playsInline: true,
-    disablePictureInPicture: true,
-    controls: false,
-    src: waveUrl
+    src: source
+  });
+};
+
+var KeyframeWaveContent = function KeyframeWaveContent(_ref2) {
+  var wave = _ref2.wave;
+  var source = prefix + wave.png;
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      width: "100%",
+      height: "100%",
+      backgroundImage: "url(".concat(source, ")"),
+      backgroundSize: "100%",
+      animationName: "vreo-wave-keyframes",
+      animationTimingFunction: "steps(".concat(wave.frames - 1, ")"),
+      animationDuration: "".concat(wave.frames / 25, "s"),
+      animationIterationCount: 'infinite'
+    }
   });
-}
+};

package/lib/Player/modules/keyframes/BgMusic/index.js

@@ -17,6 +17,28 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+var audioList = [];
+
+function getAudio() {
+  var src = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var currentTime = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+
+  var audio = function () {
+    var audio = audioList.find(function (audio) {
+      return audio.src === src && audio.paused;
+    });
+    if (audio) return audio;else {
+      var newAudio = new Audio(src);
+      audioList.push(newAudio);
+      return newAudio;
+    }
+  }();
+
+  audio.currentTime = currentTime;
+  audio.setAttribute('playsinline', 'true');
+  return audio;
+}
+
 function BgMusic() {
   var controller = (0, _hooks.useController)();
   var timeoutIdRef = React.useRef(null);
@@ -27,19 +49,13 @@ function BgMusic() {
     }
   }, []);
   React.useEffect(function () {
-    var audio = new Audio();
-    audio.setAttribute('id', 'vreo-singleton-bgmusic');
-    audio.style.display = 'none';
-    audio.setAttribute('playsinline', 'true');
-    audio.loop = true;
-    document.body.append(audio);
-
-    var callback = function callback(keyframe) {
+    var callback = function callback(keyframe, currentTime) {
+      console.log({
+        currentTime: currentTime
+      });
       var start = keyframe.start,
           end = keyframe.end;
-      var _ref = keyframe.data,
-          url = _ref.url;
-      audio.src = url;
+      var audio = getAudio(keyframe.data.url, Math.max(currentTime - start, 0));
 
       var playCallback = function playCallback() {
         audio.play();
@@ -49,15 +65,15 @@ function BgMusic() {
       cleanTimeout();
 
       var cleanAudio = function cleanAudio() {
+        console.log('cleanAudio', keyframe.start);
+        audio.removeEventListener('canplaythrough', playCallback);
         audio.pause();
-        audio.currentTime = 0;
-        audio.src = '';
         cleanTimeout();
-        audio.removeEventListener('canplaythrough', playCallback);
       };
 
-      var duration = end - start || 5000;
+      var duration = end - start;
       timeoutIdRef.current = setTimeout(function () {
+        console.log('timeout', duration);
         cleanAudio();
       }, duration);
       controller.once('paused', function () {
@@ -68,7 +84,6 @@ function BgMusic() {
     controller.on(_VreoUnit.VreoKeyframeEnum.BgMusic, callback);
     return function () {
       controller.off(_VreoUnit.VreoKeyframeEnum.BgMusic, callback);
-      document.body.removeChild(audio);
       cleanTimeout();
     };
   });

package/lib/Player/modules/keyframes/PanoTag/index.js

@@ -53,7 +53,7 @@ function PanoTag() {
           end = keyframe.end,
           data = keyframe.data;
       var panoTagData = data;
-      var id = 'any-id';
+      var id = Date.now().toString();
       var pointType = _dnalogel.PointType.PointTag;
       var dimensionType = _dnalogel.DimensionType.Two;
       var position = [panoTagData.vertex.x, panoTagData.vertex.y, panoTagData.vertex.z];
@@ -95,9 +95,9 @@ function PanoTag() {
       timeoutRef.current = setTimeout(function () {
         var _tag$hooks;
 
-        var id = Date.now(); // clear
-
+        // clear
         var tag = panoTagPlugin.current.getTagById(id);
+        if (!tag) return;
 
         if (tag.state) {
           tag.state.unfolded = false;