@realsee/vreo 2.6.4-alpha.5 → 2.6.4

package/lib/Player/custom/SpatialScenePanel/index.js

@@ -4,30 +4,7 @@ import { createRoot } from 'react-dom/client';
 import { Raycaster, Vector3 } from 'three';
 import { tweenProgress } from "../../../shared-utils/animationFrame/BetterTween.js";
 import { CSS3DRenderPlugin } from "../../../fivePlugins/CSS3DRenderPlugin/index.js";
-import { VreoKeyframeEnum } from "../../../typings/VreoUnit.js"; // __debug__
-// const mockData: SpatialScenePanelData = {
-//   customType: 'SpatialScenePanel',
-//   "stateList": [
-//     {
-//       "icon": "http://vrlab-public.ljcdn.com/release/seesay/tools/___fc42f951076607a22fd5c54f005ba553.png",
-//       "text": "窗帘关闭"
-//     },
-//     {
-//       "icon": "http://vrlab-public.ljcdn.com/release/seesay/tools/___b331e7ad732debc07250a169a3393b13.png",
-//       "text": "摄像头休眠"
-//     },
-//     {
-//       "icon": "http://vrlab-public.ljcdn.com/release/seesay/tools/___2e425a81ac0ad88232d50d4e52a9abfa.png",
-//       "text": "氛围音乐"
-//     },
-//     {
-//       "icon": "http://vrlab-public.ljcdn.com/release/seesay/tools/___bff48bb81cde37aa6a319d6f5d56e3a4.png",
-//       "text": "空调打开"
-//     }
-//   ],
-//   "temperature": "27",
-//   "title": "沉浸式回家"
-// }
+import { VreoKeyframeEnum } from "../../../typings/VreoUnit.js";
 // const getSphere = (position: Vector3, color = 0xffff00) => {
 //   const geometry = new SphereGeometry(0.05, 32, 16)
 //   const material = new MeshBasicMaterial({ color })
@@ -118,7 +95,7 @@ export function SpatialScenePanel(props) {
       });
       if (!container) return;
       var root = createRoot(container);
-      root.render(/*#__PURE__*/React.createElement(Panel, {
+      root.render( /*#__PURE__*/React.createElement(Panel, {
         ref: function ref(_ref3) {
           return panelRef.current = _ref3;
         },
@@ -130,15 +107,15 @@ export function SpatialScenePanel(props) {
         var progress = _ref4.progress;
         var needRotateY = Math.PI / 90 * 11 * progress;
         var rotateY = needRotateY - lastRotateY;
-        css3DObject === null || css3DObject === void 0 || css3DObject.rotateY(rotateY);
+        css3DObject === null || css3DObject === void 0 ? void 0 : css3DObject.rotateY(rotateY);
         // css3DObject?.rotateZ
         lastRotateY = needRotateY;
       }).onStart(function () {
-        css3DObject === null || css3DObject === void 0 || css3DObject.rotateY(startRotateY);
+        css3DObject === null || css3DObject === void 0 ? void 0 : css3DObject.rotateY(startRotateY);
         render();
       }).onDispose(function () {
         var _panelRef$current;
-        (_panelRef$current = panelRef.current) === null || _panelRef$current === void 0 || _panelRef$current.classList.add('show');
+        (_panelRef$current = panelRef.current) === null || _panelRef$current === void 0 ? void 0 : _panelRef$current.classList.add('show');
       }).play();
 
       // Object.assign(window, {  $dispose: () => {
@@ -150,9 +127,9 @@ export function SpatialScenePanel(props) {
         end = keyframe.end;
       timeoutRef.current = setTimeout(function () {
         var _panelRef$current2;
-        (_panelRef$current2 = panelRef.current) === null || _panelRef$current2 === void 0 || _panelRef$current2.classList.add('hide');
+        (_panelRef$current2 = panelRef.current) === null || _panelRef$current2 === void 0 ? void 0 : _panelRef$current2.classList.add('hide');
         timeoutRef.current = setTimeout(function () {
-          dispose === null || dispose === void 0 || dispose();
+          dispose === null || dispose === void 0 ? void 0 : dispose();
           timeoutRef.current = null;
         }, 1500);
       }, end - start);
@@ -184,10 +161,10 @@ function SpatialScenePanelBg() {
     if (!ref.current) return;
     var listener = function listener() {
       var _ref$current;
-      (_ref$current = ref.current) === null || _ref$current === void 0 || _ref$current.setAttribute('class', 'SpatialScenePanel-bg');
+      (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.setAttribute('class', 'SpatialScenePanel-bg');
       timeoutRef.current = setTimeout(function () {
         var _ref$current2;
-        (_ref$current2 = ref.current) === null || _ref$current2 === void 0 || _ref$current2.setAttribute('class', 'SpatialScenePanel-bg SpatialScenePanel-bg--animation');
+        (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.setAttribute('class', 'SpatialScenePanel-bg SpatialScenePanel-bg--animation');
         timeoutRef.current = null;
       }, 3000);
     };
@@ -203,7 +180,7 @@ function SpatialScenePanelBg() {
   });
 }
 var Panel = /*#__PURE__*/React.forwardRef(function (props, myRef) {
-  var _props$data, _props$data2, _props$data3;
+  var _props$data, _props$data2, _props$data3, _props$data3$stateLis;
   return /*#__PURE__*/React.createElement("div", {
     className: "SpatialScenePanel",
     ref: myRef
@@ -217,7 +194,7 @@ var Panel = /*#__PURE__*/React.forwardRef(function (props, myRef) {
     className: "SpatialScenePanel-temperature"
   }, (_props$data2 = props.data) === null || _props$data2 === void 0 ? void 0 : _props$data2.temperature, "\u2103")), /*#__PURE__*/React.createElement("div", {
     className: "SpatialScenePanel-body"
-  }, (_props$data3 = props.data) === null || _props$data3 === void 0 || (_props$data3 = _props$data3.stateList) === null || _props$data3 === void 0 ? void 0 : _props$data3.map(function (state, index) {
+  }, (_props$data3 = props.data) === null || _props$data3 === void 0 ? void 0 : (_props$data3$stateLis = _props$data3.stateList) === null || _props$data3$stateLis === void 0 ? void 0 : _props$data3$stateLis.map(function (state, index) {
     return /*#__PURE__*/React.createElement("div", {
       key: "scene-".concat(state.text),
       className: "SpatialScenePanel-item index_".concat(index)

package/lib/Player/index.js

@@ -1,15 +1,15 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _location$search$matc, _location$search$matc2;
-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); }
-function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 // 下面这一行不能删
 import * as React from 'react';
 import { createRoot } from 'react-dom/client';
@@ -49,6 +49,8 @@ var audioCacheLength = Number((_location$search$matc = (_location$search$matc2 =
  * ```
  */
 export var Player = /*#__PURE__*/function (_Subscribe) {
+  _inherits(Player, _Subscribe);
+  var _super = _createSuper(Player);
   /**
    * 创建 Vreo 播放器实例
    * 
@@ -59,12 +61,10 @@ export var Player = /*#__PURE__*/function (_Subscribe) {
     var _this;
     var configs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     _classCallCheck(this, Player);
-    _this = _callSuper(this, Player);
-    /** Five 渲染引擎实例 */
-    /** 内部控制器 */
-    _defineProperty(_this, "disposers", []);
-    _defineProperty(_this, "loadGeneration", 0);
-    _defineProperty(_this, "disposed", false);
+    _this = _super.call(this);
+    _defineProperty(_assertThisInitialized(_this), "disposers", []);
+    _defineProperty(_assertThisInitialized(_this), "loadGeneration", 0);
+    _defineProperty(_assertThisInitialized(_this), "disposed", false);
     _this.$five = five;
     generateBlankAudio(audioCacheLength);
     if (!configs.container) {
@@ -96,7 +96,7 @@ export var Player = /*#__PURE__*/function (_Subscribe) {
       configs: _this.configs
     });
     _this.root = createRoot(configs.container);
-    _this.root.render(/*#__PURE__*/React.createElement(ControllerContext.Provider, {
+    _this.root.render( /*#__PURE__*/React.createElement(ControllerContext.Provider, {
       value: _this.controller
     }, /*#__PURE__*/React.createElement(App, null), /*#__PURE__*/React.createElement(Drawer, null), /*#__PURE__*/React.createElement(PopUp, null), _this.configs.customKeyframes && _this.configs.customKeyframes.map(function (CustomCmpt, key) {
       return /*#__PURE__*/React.createElement(CustomCmpt, {
@@ -160,18 +160,21 @@ export var Player = /*#__PURE__*/function (_Subscribe) {
    * await player.load(vreoUnit, 0, false, true)
    * ```
    */
-  _inherits(Player, _Subscribe);
-  return _createClass(Player, [{
+  _createClass(Player, [{
     key: "getMediaManager",
-    value: function getMediaManager() {
+    value: /** Five 渲染引擎实例 */
+
+    /** 内部控制器 */
+
+    function getMediaManager() {
       var _this$controller$play;
       return (_this$controller$play = this.controller.playback.capture()) === null || _this$controller$play === void 0 ? void 0 : _this$controller$play.mediaManager;
     }
     /** 播放器配置（只读） */
   }, {
     key: "load",
-    value: (function () {
-      var _load = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(vreoUnit) {
+    value: function () {
+      var _load = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(vreoUnit) {
         var _this2 = this;
         var currentTime,
           preload,
@@ -181,158 +184,161 @@ export var Player = /*#__PURE__*/function (_Subscribe) {
           run,
           valid,
           _this$controller$vide,
-          _this$configs$imageOp,
           _this$controller$vide2,
+          _this$configs$imageOp,
           _this$controller$vide3,
+          _this$controller$vide4,
           panoIndexMap,
           panoIndexes,
           i,
-          _args = arguments,
-          _t;
-        return _regenerator().w(function (_context) {
-          while (1) switch (_context.p = _context.n) {
-            case 0:
-              currentTime = _args.length > 1 && _args[1] !== undefined ? _args[1] : 0;
-              preload = _args.length > 2 && _args[2] !== undefined ? _args[2] : false;
-              force = _args.length > 3 && _args[3] !== undefined ? _args[3] : false;
-              userAction = _args.length > 4 && _args[4] !== undefined ? _args[4] : false;
-              generation = ++this.loadGeneration;
-              this.controller.playback.cancel();
-              if (!(this.disposed || !this.controller.playback.begin(userAction))) {
-                _context.n = 1;
-                break;
-              }
-              return _context.a(2, false);
-            case 1:
-              run = this.controller.playback.capture();
-              valid = function valid() {
-                return run.valid();
-              };
-              _context.p = 2;
-              this.controller.clear();
-              this.controller.setLoading(true);
-              if (force) {
-                vreoUnit = JSON.parse(JSON.stringify(vreoUnit));
-              }
-              // if (!this.controller.visible) {
-              //     this.controller.setVisible(true)
-              //     // 延迟 500ms 规避跟 DOM 动画冲突
-              //     await new Promise((resolve) => {
-              //         setTimeout(() => resolve(true), 500)
-              //     })
-              // }
+          _args = arguments;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                currentTime = _args.length > 1 && _args[1] !== undefined ? _args[1] : 0;
+                preload = _args.length > 2 && _args[2] !== undefined ? _args[2] : false;
+                force = _args.length > 3 && _args[3] !== undefined ? _args[3] : false;
+                userAction = _args.length > 4 && _args[4] !== undefined ? _args[4] : false;
+                generation = ++this.loadGeneration;
+                this.controller.playback.cancel();
+                if (!(this.disposed || !this.controller.playback.begin(userAction))) {
+                  _context.next = 8;
+                  break;
+                }
+                return _context.abrupt("return", false);
+              case 8:
+                run = this.controller.playback.capture();
+                valid = function valid() {
+                  return run.valid();
+                };
+                _context.prev = 10;
+                this.controller.clear();
+                this.controller.setLoading(true);
+                if (force) {
+                  vreoUnit = JSON.parse(JSON.stringify(vreoUnit));
+                }
+                // if (!this.controller.visible) {
+                //     this.controller.setVisible(true)
+                //     // 延迟 500ms 规避跟 DOM 动画冲突
+                //     await new Promise((resolve) => {
+                //         setTimeout(() => resolve(true), 500)
+                //     })
+                // }
 
-              if (this.controller.stopInterval) {
-                this.controller.stopInterval();
-                this.controller.stopInterval = undefined;
-              }
-              this.controller.vreoUnit = vreoUnit;
-              (_this$controller$vide = this.controller.videoAgentScene) === null || _this$controller$vide === void 0 || (_this$controller$vide = _this$controller$vide.videoAgentMesh.mediaOperations) === null || _this$controller$vide === void 0 || _this$controller$vide.pause();
+                if (this.controller.stopInterval) {
+                  this.controller.stopInterval();
+                  this.controller.stopInterval = undefined;
+                }
+                this.controller.vreoUnit = vreoUnit;
+                (_this$controller$vide = this.controller.videoAgentScene) === null || _this$controller$vide === void 0 ? void 0 : (_this$controller$vide2 = _this$controller$vide.videoAgentMesh.mediaOperations) === null || _this$controller$vide2 === void 0 ? void 0 : _this$controller$vide2.pause();
 
-              // 预载逻辑
-              // 是否降低图片分辨率
-              if (this.$five.imageOptions.size && (_this$configs$imageOp = this.configs.imageOptions) !== null && _this$configs$imageOp !== void 0 && _this$configs$imageOp.size && this.$five.imageOptions.size > this.configs.imageOptions.size) {
-                this.$five.imageOptions.size = this.configs.imageOptions.size;
-              }
+                // 预载逻辑
+                // 是否降低图片分辨率
+                if (this.$five.imageOptions.size && (_this$configs$imageOp = this.configs.imageOptions) !== null && _this$configs$imageOp !== void 0 && _this$configs$imageOp.size && this.$five.imageOptions.size > this.configs.imageOptions.size) {
+                  this.$five.imageOptions.size = this.configs.imageOptions.size;
+                }
 
-              // 预载数据中的点位
-              if (!(preload || preload === undefined && this.configs.autoPreload)) {
-                _context.n = 6;
-                break;
-              }
-              panoIndexMap = vreoUnit.keyframes.filter(function (vreoKeyframe) {
-                if (vreoKeyframe.type !== VreoKeyframeEnum.CameraMovement) {
-                  return false;
+                // 预载数据中的点位
+                if (!(preload || preload === undefined && this.configs.autoPreload)) {
+                  _context.next = 30;
+                  break;
                 }
-                var data = vreoKeyframe.data;
-                if (data.panoIndex === undefined) {
-                  return false;
+                panoIndexMap = vreoUnit.keyframes.filter(function (vreoKeyframe) {
+                  if (vreoKeyframe.type !== VreoKeyframeEnum.CameraMovement) {
+                    return false;
+                  }
+                  var data = vreoKeyframe.data;
+                  if (data.panoIndex === undefined) {
+                    return false;
+                  }
+                  return true;
+                }).reduce(function (accu, curr) {
+                  var panoIndex = curr.data.panoIndex;
+                  if (!accu[panoIndex]) {
+                    accu[panoIndex] = true;
+                  }
+                  return accu;
+                }, {});
+                panoIndexes = Object.keys(panoIndexMap);
+                i = 0;
+              case 22:
+                if (!(i < panoIndexes.length)) {
+                  _context.next = 30;
+                  break;
                 }
-                return true;
-              }).reduce(function (accu, curr) {
-                var panoIndex = curr.data.panoIndex;
-                if (!accu[panoIndex]) {
-                  accu[panoIndex] = true;
+                _context.next = 25;
+                return this.$five.preloadPano(Number(panoIndexes[i]));
+              case 25:
+                if (!(!valid() || generation !== this.loadGeneration)) {
+                  _context.next = 27;
+                  break;
                 }
-                return accu;
-              }, {});
-              panoIndexes = Object.keys(panoIndexMap);
-              i = 0;
-            case 3:
-              if (!(i < panoIndexes.length)) {
-                _context.n = 6;
-                break;
-              }
-              _context.n = 4;
-              return this.$five.preloadPano(Number(panoIndexes[i]));
-            case 4:
-              if (!(!valid() || generation !== this.loadGeneration)) {
-                _context.n = 5;
-                break;
-              }
-              return _context.a(2, false);
-            case 5:
-              i++;
-              _context.n = 3;
-              break;
-            case 6:
-              // 新数据载入就绪
-              this.emit('loaded', vreoUnit);
-              this.controller.emit('loaded', vreoUnit);
-              if (!(!valid() || generation !== this.loadGeneration)) {
-                _context.n = 7;
-                break;
-              }
-              return _context.a(2, false);
-            case 7:
-              if ((_this$controller$vide2 = this.controller.videoAgentScene) !== null && _this$controller$vide2 !== void 0 && _this$controller$vide2.videoAgentMesh.mediaOperations) {
-                this.controller.videoAgentScene.videoAgentMesh.mediaOperations.currentTime = currentTime / 1000;
-              }
-              this.controller.setAvatar(vreoUnit.video.avatar);
-              _context.n = 8;
-              return waitForBlankAudioGenerated();
-            case 8:
-              if (!(!valid() || generation !== this.loadGeneration)) {
-                _context.n = 9;
-                break;
-              }
-              return _context.a(2, false);
-            case 9:
-              _context.n = 10;
-              return (_this$controller$vide3 = this.controller.videoAgentScene) === null || _this$controller$vide3 === void 0 ? void 0 : _this$controller$vide3.videoAgentMesh.play(vreoUnit.video.url, currentTime / 1000, vreoUnit.video.duration);
-            case 10:
-              if (!(!valid() || generation !== this.loadGeneration)) {
-                _context.n = 11;
+                return _context.abrupt("return", false);
+              case 27:
+                i++;
+                _context.next = 22;
                 break;
-              }
-              return _context.a(2, false);
-            case 11:
-              this.controller.setEnded(false);
-              this.play(undefined, userAction);
-              this.controller.run(function (type, keyframe) {
-                return _this2.emit(type, keyframe, _this2.controller.currentTime);
-              });
-              this.controller.setLoading(false);
-              return _context.a(2, true);
-            case 12:
-              _context.p = 12;
-              _t = _context.v;
-              if (valid()) {
-                _context.n = 13;
-                break;
-              }
-              return _context.a(2, false);
-            case 13:
-              this.controller.playback.cancel();
-              throw _t;
-            case 14:
-              _context.p = 14;
-              if (generation === this.loadGeneration) this.controller.setLoading(false);
-              return _context.f(14);
-            case 15:
-              return _context.a(2);
+              case 30:
+                // 新数据载入就绪
+                this.emit('loaded', vreoUnit);
+                this.controller.emit('loaded', vreoUnit);
+                if (!(!valid() || generation !== this.loadGeneration)) {
+                  _context.next = 34;
+                  break;
+                }
+                return _context.abrupt("return", false);
+              case 34:
+                if ((_this$controller$vide3 = this.controller.videoAgentScene) !== null && _this$controller$vide3 !== void 0 && _this$controller$vide3.videoAgentMesh.mediaOperations) {
+                  this.controller.videoAgentScene.videoAgentMesh.mediaOperations.currentTime = currentTime / 1000;
+                }
+                this.controller.setAvatar(vreoUnit.video.avatar);
+                _context.next = 38;
+                return waitForBlankAudioGenerated();
+              case 38:
+                if (!(!valid() || generation !== this.loadGeneration)) {
+                  _context.next = 40;
+                  break;
+                }
+                return _context.abrupt("return", false);
+              case 40:
+                _context.next = 42;
+                return (_this$controller$vide4 = this.controller.videoAgentScene) === null || _this$controller$vide4 === void 0 ? void 0 : _this$controller$vide4.videoAgentMesh.play(vreoUnit.video.url, currentTime / 1000, vreoUnit.video.duration);
+              case 42:
+                if (!(!valid() || generation !== this.loadGeneration)) {
+                  _context.next = 44;
+                  break;
+                }
+                return _context.abrupt("return", false);
+              case 44:
+                this.controller.setEnded(false);
+                this.play(undefined, userAction);
+                this.controller.run(function (type, keyframe) {
+                  return _this2.emit(type, keyframe, _this2.controller.currentTime);
+                });
+                this.controller.setLoading(false);
+                return _context.abrupt("return", true);
+              case 51:
+                _context.prev = 51;
+                _context.t0 = _context["catch"](10);
+                if (valid()) {
+                  _context.next = 55;
+                  break;
+                }
+                return _context.abrupt("return", false);
+              case 55:
+                this.controller.playback.cancel();
+                throw _context.t0;
+              case 57:
+                _context.prev = 57;
+                if (generation === this.loadGeneration) this.controller.setLoading(false);
+                return _context.finish(57);
+              case 60:
+              case "end":
+                return _context.stop();
+            }
           }
-        }, _callee, this, [[2, 12, 14, 15]]);
+        }, _callee, this, [[10, 51, 57, 60]]);
       }));
       function load(_x) {
         return _load.apply(this, arguments);
@@ -343,7 +349,6 @@ export var Player = /*#__PURE__*/function (_Subscribe) {
      * 获取播放器是否处于暂停状态
      * @returns 是否暂停中
      */
-    )
   }, {
     key: "paused",
     get: function get() {
@@ -368,11 +373,11 @@ export var Player = /*#__PURE__*/function (_Subscribe) {
   }, {
     key: "play",
     value: function play(currentTime) {
-      var _this$controller$vide4, _this$controller$vreo;
+      var _this$controller$vide5, _this$controller$vreo;
       var userAction = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       if (this.disposed || !this.controller.playback.begin(userAction)) return false;
       if (this.controller.playing) return true;
-      if (currentTime && (_this$controller$vide4 = this.controller.videoAgentScene) !== null && _this$controller$vide4 !== void 0 && _this$controller$vide4.videoAgentMesh.mediaOperations) {
+      if (currentTime && (_this$controller$vide5 = this.controller.videoAgentScene) !== null && _this$controller$vide5 !== void 0 && _this$controller$vide5.videoAgentMesh.mediaOperations) {
         this.controller.videoAgentScene.videoAgentMesh.mediaOperations.currentTime = currentTime / 1000;
       }
       Object.assign(window, {
@@ -380,7 +385,7 @@ export var Player = /*#__PURE__*/function (_Subscribe) {
       });
       this.controller.setEnded(false);
       this.controller.setPlaying(true);
-      (_this$controller$vreo = this.controller.vreoUnit) === null || _this$controller$vreo === void 0 || _this$controller$vreo.keyframes.forEach(function (keyframe) {
+      (_this$controller$vreo = this.controller.vreoUnit) === null || _this$controller$vreo === void 0 ? void 0 : _this$controller$vreo.keyframes.forEach(function (keyframe) {
         if (keyframe.type === VreoKeyframeEnum.BgMusic) {
           keyframe.parsed = false;
         }
@@ -462,6 +467,7 @@ export var Player = /*#__PURE__*/function (_Subscribe) {
       this.root.unmount();
     }
   }]);
+  return Player;
 }(Subscribe);
 
 // 导出自定义组件

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

@@ -6,7 +6,8 @@ var DrawerView = observer(function (_ref) {
   var _controller$drawerCon2;
   var controller = _ref.controller;
   var maxHeight = '400px';
-  var height = function (_controller$drawerCon) {
+  var height = function () {
+    var _controller$drawerCon;
     var height = (_controller$drawerCon = controller.drawerConfig) === null || _controller$drawerCon === void 0 ? void 0 : _controller$drawerCon.height;
     if (!height) {
       return 'max-content';