@realsee/vreo 2.6.4-alpha.1 → 2.6.4-alpha.3

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

@@ -1,5 +1,4 @@
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import * as React from 'react';
 import { getAudio } from "../../../../shared-utils/Audio.js";
 import { VreoKeyframeEnum } from "../../../../typings/VreoUnit.js";
@@ -7,83 +6,60 @@ import { useController } from "../../../hooks.js";
 export function BgMusic() {
   var controller = useController();
   React.useEffect(function () {
-    var callback = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(keyframe, currentTime) {
-        var _controller$configs$w, _controller$configs;
-        var start, end, _currentTime, audio, waitForLoaded, cleanAudio, play, playOnCanPlay;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                start = keyframe.start, end = keyframe.end;
-                _currentTime = (currentTime - start) / 1000;
-                if (!(_currentTime < 0 || _currentTime >= keyframe.end - keyframe.start)) {
-                  _context.next = 4;
-                  break;
-                }
-                return _context.abrupt("return");
-              case 4:
-                audio = getAudio(keyframe.data.url);
-                audio.currentTime = Math.max(0, _currentTime);
-                waitForLoaded = (_controller$configs$w = (_controller$configs = controller.configs) === null || _controller$configs === void 0 ? void 0 : _controller$configs.waitForBgMusicLoaded) !== null && _controller$configs$w !== void 0 ? _controller$configs$w : false;
-                cleanAudio = function cleanAudio() {
-                  audio.removeEventListener('canplay', playOnCanPlay);
-                  audio.removeEventListener('pause', play);
-                  audio.pause();
-                  audio.src = '';
-                };
-                play = function play() {
-                  if (audio.realSrc === keyframe.data.url) {
-                    // 有可能会被其他音轨打断
-                    audio.play();
-                  }
-                }; // canplay 事件比 canplaythrough 更早触发，表示可以开始播放了
-                playOnCanPlay = function playOnCanPlay() {
-                  audio.removeEventListener('canplay', playOnCanPlay);
-                  audio.play();
-                  // 解除等待状态，恢复主时间线播放
-                  controller.setWaitingForBgMusic(false);
-                };
-                if (waitForLoaded) {
-                  // 等待音频加载完成后再播放
-                  // readyState: 0=HAVE_NOTHING, 1=HAVE_METADATA, 2=HAVE_CURRENT_DATA, 3=HAVE_FUTURE_DATA, 4=HAVE_ENOUGH_DATA
-                  if (audio.readyState >= 3) {
-                    // readyState >= 3 表示有足够数据开始播放
-                    audio.play();
-                  } else {
-                    // 设置等待状态，阻塞整个播放流程
-                    controller.setWaitingForBgMusic(true);
-                    // 监听 canplay 事件（可以开始播放）
-                    audio.addEventListener('canplay', playOnCanPlay);
-                  }
-                } else {
-                  // 默认行为：立即播放，边加载边播放
-                  audio.play();
-                }
-                audio.addEventListener('ended', function () {
-                  cleanAudio();
-                });
-                audio.addEventListener('pause', play);
-                controller.once('paused', function () {
-                  // 如果播放器暂停，也要解除等待状态
-                  controller.setWaitingForBgMusic(false);
-                  cleanAudio();
-                });
-              case 14:
-              case "end":
-                return _context.stop();
-            }
+    var tracks = new Set();
+    var callback = function callback(keyframe, currentTime) {
+      var run = controller.playback.capture();
+      var valid = function valid() {
+        return !!(run !== null && run !== void 0 && run.valid());
+      };
+      if (!valid()) return;
+      var element = getAudio();
+      var audio = run.bind(element);
+      var cleaned = false;
+      var _clean = function clean() {
+        if (cleaned) return;
+        cleaned = true;
+        element.removeEventListener('canplay', _play);
+        element.removeEventListener('ended', _clean);
+        audio.muted = true;
+        audio.pause();
+        audio.src = '';
+        remove();
+        tracks.delete(_clean);
+        controller.setWaitingForBgMusic(false);
+      };
+      var remove = controller.playback.add(_clean);
+      tracks.add(_clean);
+      var _play = function play() {
+        element.removeEventListener('canplay', _play);
+        if (!valid() || cleaned) return;
+        audio.muted = false;
+        void audio.play().catch(function (error) {
+          if (valid() && !cleaned) {
+            _clean();
+            controller.playback.cancel();
+            console.error(error);
           }
-        }, _callee);
-      }));
-      return function callback(_x, _x2) {
-        return _ref.apply(this, arguments);
+        });
+        controller.setWaitingForBgMusic(false);
       };
-    }();
+      audio.muted = true;
+      audio.src = keyframe.data.url;
+      audio.currentTime = Math.max(0, (currentTime - keyframe.start) / 1000);
+      element.addEventListener('ended', _clean);
+      if (controller.configs.waitForBgMusicLoaded && element.readyState < 3) {
+        controller.setWaitingForBgMusic(true);
+        element.addEventListener('canplay', _play);
+      } else _play();
+    };
     controller.on(VreoKeyframeEnum.BgMusic, callback);
     return function () {
       controller.off(VreoKeyframeEnum.BgMusic, callback);
+      for (var _i = 0, _arr = _toConsumableArray(tracks); _i < _arr.length; _i++) {
+        var clean = _arr[_i];
+        clean();
+      }
     };
-  });
+  }, [controller]);
   return /*#__PURE__*/React.createElement(React.Fragment, null);
 }

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

@@ -1,5 +1,6 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 import * as React from 'react';
 import { CameraMovementPlugin } from "../../../../fivePlugins/CameraMovementPlugin/index.js";
 import { CameraMovementEffect } from "../../../../fivePlugins/CameraMovementPlugin/typings.js";
@@ -11,54 +12,51 @@ export function CameraMovement() {
   var ref = React.useRef();
   React.useEffect(function () {
     var callback = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(keyframe) {
+      var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(keyframe) {
         var start, end, data, cameraMovementData, effect;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                if (!ref.current) {
-                  ref.current = CameraMovementPlugin(five, {});
-                }
-                start = keyframe.start, end = keyframe.end, data = keyframe.data;
-                cameraMovementData = data;
-                effect = cameraMovementData.effect;
-                if (!(effect === CameraMovementEffect.Rotate)) {
-                  _context.next = 9;
-                  break;
-                }
-                _context.next = 7;
-                return ref.current.rotate(data, end - start);
-              case 7:
-                _context.next = 21;
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.n) {
+            case 0:
+              if (!ref.current) {
+                ref.current = CameraMovementPlugin(five, {});
+              }
+              start = keyframe.start, end = keyframe.end, data = keyframe.data;
+              cameraMovementData = data;
+              effect = cameraMovementData.effect;
+              if (!(effect === CameraMovementEffect.Rotate)) {
+                _context.n = 2;
                 break;
-              case 9:
-                if (!(effect === CameraMovementEffect.Move)) {
-                  _context.next = 14;
-                  break;
-                }
-                _context.next = 12;
-                return ref.current.move(data, end - start);
-              case 12:
-                _context.next = 21;
+              }
+              _context.n = 1;
+              return ref.current.rotate(data, end - start);
+            case 1:
+              _context.n = 7;
+              break;
+            case 2:
+              if (!(effect === CameraMovementEffect.Move)) {
+                _context.n = 4;
                 break;
-              case 14:
-                if (!(cameraMovementData.panoIndex !== undefined && cameraMovementData.panoIndex !== five.panoIndex)) {
-                  _context.next = 19;
-                  break;
-                }
-                _context.next = 17;
-                return ref.current.move(data, end - start);
-              case 17:
-                _context.next = 21;
+              }
+              _context.n = 3;
+              return ref.current.move(data, end - start);
+            case 3:
+              _context.n = 7;
+              break;
+            case 4:
+              if (!(cameraMovementData.panoIndex !== undefined && cameraMovementData.panoIndex !== five.panoIndex)) {
+                _context.n = 6;
                 break;
-              case 19:
-                _context.next = 21;
-                return ref.current.rotate(data, end - start);
-              case 21:
-              case "end":
-                return _context.stop();
-            }
+              }
+              _context.n = 5;
+              return ref.current.move(data, end - start);
+            case 5:
+              _context.n = 7;
+              break;
+            case 6:
+              _context.n = 7;
+              return ref.current.rotate(data, end - start);
+            case 7:
+              return _context.a(2);
           }
         }, _callee);
       }));

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

@@ -1,21 +1,6 @@
 import * as React from 'react';
 import { InfoPanelStyleEnum, InfoPanelTypeEnum, VreoKeyframeEnum } from "../../../../typings/VreoUnit.js";
 import { useController } from "../../../hooks.js";
-var isWX = navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1;
-var isIOS = navigator.userAgent.toLowerCase().indexOf('iphone') !== -1;
-var isIOSorWX = isIOS || isWX;
-var _videoElement = document.createElement('video');
-_videoElement.setAttribute('playsinline', 'true');
-_videoElement.setAttribute('webkit-playsinline', 'true');
-if (isIOSorWX) {
-  if (_videoElement.paused) {
-    _videoElement.addEventListener('click', function () {
-      return _videoElement.play();
-    }, {
-      once: true
-    });
-  }
-}
 function InfoPanelImg(_ref) {
   var url = _ref.url,
     children = _ref.children;
@@ -33,32 +18,55 @@ function InfoPanelVideo(_ref2) {
   var videoWrapperRef = React.useRef(null);
   var controller = useController();
   React.useEffect(function () {
-    var _controller$configs, _controller$configs$v;
+    var _controller$configs;
     // if (!isIOSorWX) return
-    var video = ((_controller$configs = controller.configs) === null || _controller$configs === void 0 ? void 0 : (_controller$configs$v = _controller$configs.videos) === null || _controller$configs$v === void 0 ? void 0 : _controller$configs$v.videoPanel) || _videoElement;
+    var video = ((_controller$configs = controller.configs) === null || _controller$configs === void 0 || (_controller$configs = _controller$configs.videos) === null || _controller$configs === void 0 ? void 0 : _controller$configs.videoPanel) || document.createElement('video');
+    var run = controller.playback.capture();
+    var valid = function valid() {
+      return !!(run !== null && run !== void 0 && run.valid());
+    };
+    if (!(run !== null && run !== void 0 && run.valid())) return;
+    var output = run.bind(video);
+    var disposed = false;
+    video.playsInline = true;
+    output.muted = true;
+    var stop = function stop() {
+      disposed = true;
+      output.muted = true;
+      output.pause();
+      video.removeEventListener('canplaythrough', _canplaythrough);
+    };
     if (!videoWrapperRef.current) return;
-    video.src = url;
+    var remove = controller.playback.add(stop);
+    output.src = url;
     if (!videoWrapperRef.current.contains(video)) {
       videoWrapperRef.current.appendChild(video);
     }
-    var canplaythrough = function canplaythrough() {
-      video.removeEventListener('canplaythrough', canplaythrough);
-      try {
-        video.play();
-      } catch (error) {}
+    var _canplaythrough = function canplaythrough() {
+      video.removeEventListener('canplaythrough', _canplaythrough);
+      if (disposed || !valid()) return;
+      output.muted = false;
+      void output.play().catch(function (error) {
+        if (valid() && !disposed) {
+          stop();
+          controller.playback.cancel();
+          console.error(error);
+        }
+      });
     };
-    video.addEventListener('canplaythrough', canplaythrough);
-    video.load();
-    // video.play()
+    video.addEventListener('canplaythrough', _canplaythrough);
+    output.load();
+    // output.play()
 
     return function () {
       var _videoWrapperRef$curr;
-      video.pause();
+      stop();
+      remove();
       if ((_videoWrapperRef$curr = videoWrapperRef.current) !== null && _videoWrapperRef$curr !== void 0 && _videoWrapperRef$curr.contains(video)) {
         videoWrapperRef.current.removeChild(video);
       }
     };
-  }, [videoWrapperRef.current]);
+  }, [controller, url]);
   return /*#__PURE__*/React.createElement("div", {
     className: "vreo-infoPanel-container"
   }, /*#__PURE__*/React.createElement("div", {
@@ -99,14 +107,14 @@ export function InfoPanel() {
       do {
         if (style === InfoPanelStyleEnum.PopUp) {
           if (infoPanelData.type === InfoPanelTypeEnum.Image) {
-            controller.openPopUp( /*#__PURE__*/React.createElement(InfoPanelImg, {
+            controller.openPopUp(/*#__PURE__*/React.createElement(InfoPanelImg, {
               url: infoPanelData.url
             }, /*#__PURE__*/React.createElement(Title, {
               title: title,
               subTitle: subTitle
             })));
           } else if (infoPanelData.type === InfoPanelTypeEnum.Video) {
-            controller.openPopUp( /*#__PURE__*/React.createElement(InfoPanelVideo, {
+            controller.openPopUp(/*#__PURE__*/React.createElement(InfoPanelVideo, {
               url: infoPanelData.url
             }, /*#__PURE__*/React.createElement(Title, {
               title: title,
@@ -143,13 +151,15 @@ export function InfoPanel() {
       }, end - start);
     };
     controller.on(VreoKeyframeEnum.InfoPanel, callback);
-    controller.on('ended', function () {
-      controller.openPopUp(false);
-    });
-    controller.on('paused', function () {
+    var close = function close() {
+      if (timeoutRef.current) clearTimeout(timeoutRef.current);
+      controller.openDrawer(false);
       controller.openPopUp(false);
-    });
+    };
+    var remove = controller.playback.add(close);
     return function () {
+      remove();
+      close();
       controller.off(VreoKeyframeEnum.InfoPanel, callback);
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);

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

@@ -1,5 +1,6 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 import * as React from 'react';
 import * as THREE from 'three';
 import { useController, useFiveInstance } from "../../../hooks.js";
@@ -12,65 +13,97 @@ export function ModelVideo() {
   var ref = React.useRef();
   var timeoutRef = React.useRef();
   React.useEffect(function () {
+    var generation = 0;
+    var stop = function stop() {
+      var _ref$current;
+      ++generation;
+      if (timeoutRef.current) clearTimeout(timeoutRef.current);
+      (_ref$current = ref.current) === null || _ref$current === void 0 || _ref$current.dispose();
+      ref.current = undefined;
+    };
+    var remove = controller.playback.add(stop);
     var callback = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(keyframe) {
-        var _controller$configs, _controller$configs$v;
-        var start, end, _ref2, videoSrc, videoPosterSrc, vertexs, matrixWorld, position, points;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                if (!ref.current) {
-                  ref.current = ModelTVVideoPlugin(five, {});
+      var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(keyframe) {
+        var current, run, valid, plugin, start, end, _ref2, videoSrc, videoPosterSrc, vertexs, matrixWorld, position, points, _controller$configs, _t;
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.p = _context.n) {
+            case 0:
+              stop();
+              current = generation;
+              run = controller.playback.capture();
+              valid = function valid() {
+                return !!(run !== null && run !== void 0 && run.valid());
+              };
+              if (valid()) {
+                _context.n = 1;
+                break;
+              }
+              return _context.a(2);
+            case 1:
+              plugin = ref.current = ModelTVVideoPlugin(five, {
+                mediaManager: run === null || run === void 0 ? void 0 : run.mediaManager
+              });
+              start = keyframe.start, end = keyframe.end;
+              _ref2 = keyframe.data, videoSrc = _ref2.videoSrc, videoPosterSrc = _ref2.videoPosterSrc, vertexs = _ref2.vertexs, matrixWorld = _ref2.matrixWorld;
+              position = function () {
+                if (vertexs.length < 4) {
+                  throw new Error('ModelVideo: 顶点数据集合不够，无法组成矩形 ....');
+                }
+                if (vertexs.length === 4) {
+                  return vertexs;
+                }
+                var box = new THREE.Box3();
+                vertexs.forEach(function (v) {
+                  return box.expandByPoint(new THREE.Vector3(v.x, v.y, v.z));
+                });
+                return [new THREE.Vector3(box.min.x, box.max.y, box.max.z), new THREE.Vector3(box.min.x, box.min.y, box.max.z), new THREE.Vector3(box.max.x, box.min.y, box.max.z), new THREE.Vector3(box.max.x, box.max.y, box.max.z)];
+              }();
+              points = function () {
+                if (matrixWorld) {
+                  var transMatrix = createTransMatrix(matrixWorld);
+                  return [position.map(function (p) {
+                    var res = transMatrix([p.x, p.y, p.z]);
+                    return {
+                      x: res[0],
+                      y: res[1],
+                      z: res[2]
+                    };
+                  })];
                 }
-                start = keyframe.start, end = keyframe.end;
-                _ref2 = keyframe.data, videoSrc = _ref2.videoSrc, videoPosterSrc = _ref2.videoPosterSrc, vertexs = _ref2.vertexs, matrixWorld = _ref2.matrixWorld;
-                position = function () {
-                  if (vertexs.length < 4) {
-                    throw new Error('ModelVideo: 顶点数据集合不够，无法组成矩形 ....');
-                  }
-                  if (vertexs.length === 4) {
-                    return vertexs;
-                  }
-                  var box = new THREE.Box3();
-                  vertexs.forEach(function (v) {
-                    return box.expandByPoint(new THREE.Vector3(v.x, v.y, v.z));
-                  });
-                  return [new THREE.Vector3(box.min.x, box.max.y, box.max.z), new THREE.Vector3(box.min.x, box.min.y, box.max.z), new THREE.Vector3(box.max.x, box.min.y, box.max.z), new THREE.Vector3(box.max.x, box.max.y, box.max.z)];
-                }();
-                points = function () {
-                  if (matrixWorld) {
-                    var transMatrix = createTransMatrix(matrixWorld);
-                    return [position.map(function (p) {
-                      var res = transMatrix([p.x, p.y, p.z]);
-                      return {
-                        x: res[0],
-                        y: res[1],
-                        z: res[2]
-                      };
-                    })];
-                  }
-                  return [position];
-                }();
-                ref.current.disable();
-                _context.next = 8;
-                return ref.current.load({
-                  video_src: videoSrc,
-                  video_poster_src: videoPosterSrc,
-                  points: points
-                }, (_controller$configs = controller.configs) === null || _controller$configs === void 0 ? void 0 : (_controller$configs$v = _controller$configs.videos) === null || _controller$configs$v === void 0 ? void 0 : _controller$configs$v.modelTVVideo);
-              case 8:
-                ref.current.enable();
-                timeoutRef.current = setTimeout(function () {
-                  var _ref$current;
-                  return (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.disable();
-                }, end - start);
-              case 10:
-              case "end":
-                return _context.stop();
-            }
+                return [position];
+              }();
+              plugin.disable();
+              _context.p = 2;
+              _context.n = 3;
+              return plugin.load({
+                video_src: videoSrc,
+                video_poster_src: videoPosterSrc,
+                points: points
+              }, (_controller$configs = controller.configs) === null || _controller$configs === void 0 || (_controller$configs = _controller$configs.videos) === null || _controller$configs === void 0 ? void 0 : _controller$configs.modelTVVideo);
+            case 3:
+              _context.n = 5;
+              break;
+            case 4:
+              _context.p = 4;
+              _t = _context.v;
+              if (current === generation && valid()) {
+                controller.playback.cancel();
+                console.error(_t);
+              }
+              return _context.a(2);
+            case 5:
+              if (!(current !== generation || !valid())) {
+                _context.n = 6;
+                break;
+              }
+              return _context.a(2);
+            case 6:
+              plugin.enable();
+              timeoutRef.current = setTimeout(stop, end - start);
+            case 7:
+              return _context.a(2);
           }
-        }, _callee);
+        }, _callee, null, [[2, 4]]);
       }));
       return function callback(_x) {
         return _ref.apply(this, arguments);
@@ -78,6 +111,11 @@ export function ModelVideo() {
     }();
     controller.on(VreoKeyframeEnum.ModelVideo, callback);
     return function () {
+      var _ref$current2;
+      stop();
+      remove();
+      (_ref$current2 = ref.current) === null || _ref$current2 === void 0 || _ref$current2.dispose();
+      ref.current = undefined;
       controller.off(VreoKeyframeEnum.ModelVideo, callback);
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);

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

@@ -27,7 +27,8 @@ export function PanoTag() {
       return;
     }
     var callback = function callback(keyframe) {
-      if (!panoTagPlugin.current) return;
+      var run = controller.playback.capture();
+      if (!panoTagPlugin.current || !(run !== null && run !== void 0 && run.valid())) return;
       var start = keyframe.start,
         end = keyframe.end,
         data = keyframe.data;
@@ -74,6 +75,7 @@ export function PanoTag() {
       });
       var tagInstance = panoTagPlugin.current.getTagById(id);
       if (tagInstance) {
+        tagInstance.setMediaManager(run.mediaManager);
         tagInstance.state.unfolded = true;
         panoTagPlugin.current.updateRenderAllTags();
       }
@@ -86,7 +88,7 @@ export function PanoTag() {
           tag.state.unfolded = false;
           panoTagPlugin.current.updateRenderAllTags();
         }
-        (_tag$hooks = tag.hooks) === null || _tag$hooks === void 0 ? void 0 : _tag$hooks.on('folded', function () {
+        (_tag$hooks = tag.hooks) === null || _tag$hooks === void 0 || _tag$hooks.on('folded', function () {
           setTimeout(function () {
             if (tag.state) {
               tag.state.visible = false;

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

@@ -90,11 +90,11 @@ export function PanoTextLabel() {
       // 将获取的mesh进行旋转操作，根据欧拉角去进行mesh的变换
       if (data.quaternion) {
         var quaternion = new Quaternion(data.quaternion.x, data.quaternion.y, data.quaternion.z, data.quaternion.w);
-        css3DObject === null || css3DObject === void 0 ? void 0 : css3DObject.quaternion.copy(quaternion);
+        css3DObject === null || css3DObject === void 0 || css3DObject.quaternion.copy(quaternion);
       }
       if (container !== null && container !== void 0 && container.container) {
         var root = createRoot(container.container);
-        root.render( /*#__PURE__*/React.createElement("div", {
+        root.render(/*#__PURE__*/React.createElement("div", {
           className: "PanoTextLabel PanoTextLabel--notHidden"
         }, /*#__PURE__*/React.createElement("div", {
           className: "PanoTextLabel-wrapper"
@@ -107,7 +107,7 @@ export function PanoTextLabel() {
       }
       timeoutRef.current = setTimeout(function () {
         var _ref$current;
-        (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.disposeAll();
+        (_ref$current = ref.current) === null || _ref$current === void 0 || _ref$current.disposeAll();
       }, end - start);
     };
     controller.on(VreoKeyframeEnum.PanoTextLabel, callback);

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

@@ -38,8 +38,8 @@ export function UpdateVRPanorama() {
   }, []);
   React.useEffect(function () {
     var callback = function callback(keyframe) {
-      var _five$work, _five$work$raw, _five$work2, _five$work2$raw, _five$work2$raw$works;
-      if (!deafultWorkRef.current && (_five$work = five.work) !== null && _five$work !== void 0 && (_five$work$raw = _five$work.raw) !== null && _five$work$raw !== void 0 && _five$work$raw.works) {
+      var _five$work, _five$work2;
+      if (!deafultWorkRef.current && (_five$work = five.work) !== null && _five$work !== void 0 && (_five$work = _five$work.raw) !== null && _five$work !== void 0 && _five$work.works) {
         deafultWorkRef.current = five.work.raw.works;
       }
       var data = keyframe.data;
@@ -50,7 +50,7 @@ export function UpdateVRPanorama() {
         five.load(updateWorkRef.current);
         return;
       }
-      var lastRawWork = (_five$work2 = five.work) === null || _five$work2 === void 0 ? void 0 : (_five$work2$raw = _five$work2.raw) === null || _five$work2$raw === void 0 ? void 0 : (_five$work2$raw$works = _five$work2$raw.works) === null || _five$work2$raw$works === void 0 ? void 0 : _five$work2$raw$works[0];
+      var lastRawWork = (_five$work2 = five.work) === null || _five$work2 === void 0 || (_five$work2 = _five$work2.raw) === null || _five$work2 === void 0 || (_five$work2 = _five$work2.works) === null || _five$work2 === void 0 ? void 0 : _five$work2[0];
       if (!lastRawWork) {
         console.warn('UpdateVRPanorama: 没有可用的 work 数据');
         return;