@realsee/vreo 0.2.0-alpha.9 → 1.0.0-alpha.2

package/lib/Player/index.js

@@ -1,14 +1,12 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+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.Player = void 0;
 
-var React = _interopRequireWildcard(require("react"));
-
 var ReactDOM = _interopRequireWildcard(require("react-dom"));
 
 var _five = require("@realsee/five");
@@ -37,9 +35,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
@@ -66,21 +64,37 @@ var Player = /*#__PURE__*/function (_Subscribe) {
     _classCallCheck(this, Player);
 
     _this = _super.call(this);
-    _this.controller = new _Controller.Controller();
-    _this.$five = _this.controller.$five = five;
-
-    if (!configs.containter) {
-      var containter = document.querySelector('#vreo-app') || document.createElement('div');
-      ReactDOM.unmountComponentAtNode(containter);
-      containter.setAttribute('id', 'vreo-app');
-      configs.containter = containter;
-      document.body.append(containter);
+    _this.$five = five;
+
+    if (!configs.container) {
+      configs.container = configs.containter;
     }
 
+    if (!configs.container) {
+      var _five$getElement;
+
+      var container = document.getElementById('vreo-app') || document.createElement('div');
+      ReactDOM.unmountComponentAtNode(container);
+      container.setAttribute('id', 'vreo-app');
+      configs.container = container;
+      var fiveCanvasDomParent = (_five$getElement = five.getElement()) === null || _five$getElement === void 0 ? void 0 : _five$getElement.parentNode;
+
+      if (fiveCanvasDomParent) {
+        fiveCanvasDomParent.append(container);
+      } else {
+        document.body.append(container);
+      }
+    }
+
+    if (!configs.container.classList.contains('vreo-app')) configs.container.classList.add('vreo-app');
     _this.configs = Object.freeze(Object.assign({
       keyframeMap: {}
     }, configs));
-    _this.controller.configs = _this.configs;
+    _this.controller = new _Controller.Controller({
+      five: five,
+      container: configs.container,
+      configs: _this.configs
+    });
     ReactDOM.render( /*#__PURE__*/React.createElement(_Controller.ControllerContext.Provider, {
       value: _this.controller
     }, /*#__PURE__*/React.createElement(_App.App, null), /*#__PURE__*/React.createElement(_Drawer.Drawer, null), /*#__PURE__*/React.createElement(_PopUp.PopUp, null), _this.configs.customKeyframes && _this.configs.customKeyframes.map(function (CustomCmpt, key) {
@@ -99,12 +113,21 @@ var Player = /*#__PURE__*/function (_Subscribe) {
         },
         five: five
       });
-    })), configs.containter); // 监听播放情况：抛出触发时机
+    })), configs.container); // 监听播放情况：抛出触发时机
 
+    (0, _mobx.reaction)(function () {
+      return _this.controller.ended;
+    }, function (ended) {
+      if (ended) {
+        _this.emit('paused', true);
+      }
+    });
     (0, _mobx.reaction)(function () {
       return _this.controller.playing;
     }, function (playing) {
-      _this.emit(playing ? 'playing' : 'paused');
+      if (!_this.controller.ended) {
+        _this.emit(playing ? 'playing' : 'paused');
+      }
     });
     return _this;
   }
@@ -113,48 +136,54 @@ var Player = /*#__PURE__*/function (_Subscribe) {
     key: "load",
     value: function () {
       var _load = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(vreoUnit) {
-        var _this$controller$vide,
+        var _this$controller$medi,
             _this$configs$imageOp,
+            _this$controller$vide,
+            _this$controller$vide2,
             _this2 = this;
 
         var currentTime,
             preload,
+            force,
             panoIndexMap,
-            panoIndexs,
+            panoIndexes,
             i,
-            _this$controller$vide2,
-            _this$controller$vide3,
             _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;
+                this.controller.setLoading(true);
+
+                if (force) {
+                  vreoUnit = JSON.parse(JSON.stringify(vreoUnit));
+                }
 
                 if (this.controller.visible) {
-                  _context.next = 6;
+                  _context.next = 9;
                   break;
                 }
 
                 this.controller.setVisible(true); // 延迟 500ms 规避跟 DOM 动画冲突
 
-                _context.next = 6;
+                _context.next = 9;
                 return new Promise(function (resolve) {
                   setTimeout(function () {
                     return resolve(true);
                   }, 500);
                 });
 
-              case 6:
+              case 9:
                 if (this.controller.stopInterval) {
                   this.controller.stopInterval();
                   this.controller.stopInterval = undefined;
                 }
 
                 this.controller.vreoUnit = vreoUnit;
-                (_this$controller$vide = this.controller.videoInstance) === null || _this$controller$vide === void 0 ? void 0 : _this$controller$vide.pause(); // 预载逻辑
+                (_this$controller$medi = this.controller.mediaInstance) === null || _this$controller$medi === void 0 ? void 0 : _this$controller$medi.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) {
@@ -163,7 +192,7 @@ var Player = /*#__PURE__*/function (_Subscribe) {
 
 
                 if (!(preload || preload === undefined && this.configs.autoPreload)) {
-                  _context.next = 20;
+                  _context.next = 23;
                   break;
                 }
 
@@ -188,49 +217,46 @@ var Player = /*#__PURE__*/function (_Subscribe) {
 
                   return accu;
                 }, {});
-                panoIndexs = Object.keys(panoIndexMap);
+                panoIndexes = Object.keys(panoIndexMap);
                 i = 0;
 
-              case 14:
-                if (!(i < panoIndexs.length)) {
-                  _context.next = 20;
+              case 17:
+                if (!(i < panoIndexes.length)) {
+                  _context.next = 23;
                   break;
                 }
 
-                _context.next = 17;
-                return this.$five.preloadPano(Number(panoIndexs[i]));
+                _context.next = 20;
+                return this.$five.preloadPano(Number(panoIndexes[i]));
 
-              case 17:
+              case 20:
                 i++;
-                _context.next = 14;
+                _context.next = 17;
                 break;
 
-              case 20:
+              case 23:
                 // 新数据载入就绪
                 this.emit('loaded', vreoUnit);
+                this.controller.emit('loaded', vreoUnit);
 
-                if (!vreoUnit.video.url) {
-                  _context.next = 26;
-                  break;
-                }
-
-                if ((_this$controller$vide2 = this.controller.videoAgentScene) !== null && _this$controller$vide2 !== void 0 && _this$controller$vide2.videoAgentMesh.videoInstance) {
-                  this.controller.videoAgentScene.videoAgentMesh.videoInstance.currentTime = currentTime / 1000;
+                if ((_this$controller$vide = this.controller.videoAgentScene) !== null && _this$controller$vide !== void 0 && _this$controller$vide.videoAgentMesh.mediaInstance) {
+                  this.controller.videoAgentScene.videoAgentMesh.mediaInstance.currentTime = currentTime / 1000;
                 }
 
-                _context.next = 25;
-                return (_this$controller$vide3 = this.controller.videoAgentScene) === null || _this$controller$vide3 === void 0 ? void 0 : _this$controller$vide3.videoAgentMesh.play(vreoUnit.video.url);
+                this.controller.setAvatar(vreoUnit.video.avatar);
+                _context.next = 29;
+                return (_this$controller$vide2 = this.controller.videoAgentScene) === null || _this$controller$vide2 === void 0 ? void 0 : _this$controller$vide2.videoAgentMesh.play(vreoUnit.video.url, currentTime / 1000, vreoUnit.video.duration);
 
-              case 25:
+              case 29:
+                this.controller.setEnded(false);
                 this.play();
-
-              case 26:
                 this.controller.run(function (type, keyframe) {
                   return _this2.emit(type, keyframe);
                 });
+                this.controller.setLoading(false);
                 return _context.abrupt("return", true);
 
-              case 28:
+              case 34:
               case "end":
                 return _context.stop();
             }
@@ -251,11 +277,24 @@ var Player = /*#__PURE__*/function (_Subscribe) {
     }
   }, {
     key: "play",
-    value: function play() {
+    value: function play(currentTime) {
       if (this.controller.playing) return true;
+
+      if (currentTime && this.controller.mediaInstance) {
+        this.controller.mediaInstance.currentTime = currentTime / 1000;
+      }
+
+      Object.assign(window, {
+        $vreoController: this.controller
+      });
       this.controller.setPlaying(true);
       return true;
     }
+  }, {
+    key: "setAppearance",
+    value: function setAppearance(appearance) {
+      this.controller.setAppearance(appearance);
+    }
   }, {
     key: "pause",
     value: function pause() {
@@ -271,14 +310,19 @@ var Player = /*#__PURE__*/function (_Subscribe) {
     value: function hide() {
       this.controller.setVisible(false);
     }
+  }, {
+    key: "getCurrentTime",
+    value: function getCurrentTime() {
+      return this.controller.currentTime;
+    }
   }, {
     key: "dispose",
     value: function dispose() {
       this.pause();
       this.controller.dispose();
 
-      if (this.configs.containter) {
-        ReactDOM.unmountComponentAtNode(this.configs.containter);
+      if (this.configs.container) {
+        ReactDOM.unmountComponentAtNode(this.configs.container);
       }
     }
   }]);
@@ -287,4 +331,4 @@ var Player = /*#__PURE__*/function (_Subscribe) {
 }(_five.Subscribe);
 
 exports.Player = Player;
-console.log("\n\n\u250F\u2501\u2501\u2501\u2513\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u250F\u2513\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n\u2503\u250F\u2501\u2513\u2503\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2503\u2503\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n\u2503\u2517\u2501\u251B\u2503\u250F\u2501\u2501\u2513\u250F\u2501\u2501\u2513\u2501\u2503\u2503\u2501\u250F\u2501\u2501\u2513\u250F\u2501\u2501\u2513\u250F\u2501\u2501\u2513\n\u2503\u250F\u2513\u250F\u251B\u2503\u250F\u2513\u2503\u2517\u2501\u2513\u2503\u2501\u2503\u2503\u2501\u2503\u2501\u2501\u252B\u2503\u250F\u2513\u2503\u2503\u250F\u2513\u2503\n\u2503\u2503\u2503\u2517\u2513\u2503\u2503\u2501\u252B\u2503\u2517\u251B\u2517\u2513\u2503\u2517\u2513\u2523\u2501\u2501\u2503\u2503\u2503\u2501\u252B\u2503\u2503\u2501\u252B\n\u2517\u251B\u2517\u2501\u251B\u2517\u2501\u2501\u251B\u2517\u2501\u2501\u2501\u251B\u2517\u2501\u251B\u2517\u2501\u2501\u251B\u2517\u2501\u2501\u251B\u2517\u2501\u2501\u251B\n\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501 \n\n");
+console.log("\n\n\u250F\u2501\u2501\u2501\u2513\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u250F\u2513\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n\u2503\u250F\u2501\u2513\u2503\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2503\u2503\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n\u2503\u2517\u2501\u251B\u2503\u250F\u2501\u2501\u2513\u250F\u2501\u2501\u2513\u2501\u2503\u2503\u2501\u250F\u2501\u2501\u2513\u250F\u2501\u2501\u2513\u250F\u2501\u2501\u2513\n\u2503\u250F\u2513\u250F\u251B\u2503\u250F\u2513\u2503\u2517\u2501\u2513\u2503\u2501\u2503\u2503\u2501\u2503\u2501\u2501\u252B\u2503\u250F\u2513\u2503\u2503\u250F\u2513\u2503\n\u2503\u2503\u2503\u2517\u2513\u2503\u2503\u2501\u252B\u2503\u2517\u251B\u2517\u2513\u2503\u2517\u2513\u2523\u2501\u2501\u2503\u2503\u2503\u2501\u252B\u2503\u2503\u2501\u252B\n\u2517\u251B\u2517\u2501\u251B\u2517\u2501\u2501\u251B\u2517\u2501\u2501\u2501\u251B\u2517\u2501\u251B\u2517\u2501\u2501\u251B\u2517\u2501\u2501\u251B\u2517\u2501\u2501\u251B\n\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n\n");

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

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+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

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

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+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

package/lib/Player/modules/ResizeObserver/index.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare function ResizeObserver(): JSX.Element;

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

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ResizeObserver = ResizeObserver;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _addResizeListener = require("../../../shared-utils/addResizeListener");
+
+var _hooks = require("../../hooks");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function ResizeObserver() {
+  var ref = _react["default"].useRef(null);
+
+  var controller = (0, _hooks.useController)();
+
+  _react["default"].useEffect(function () {
+    if (!ref.current) return;
+    var resizeElement = controller.container.parentElement;
+    if ((0, _addResizeListener.hasResizeListener)(resizeElement)) return;
+    var dispose = (0, _addResizeListener.addResizeListener)(resizeElement, function (width, height) {
+      controller.setContainerSize(width, height);
+    });
+    return function () {
+      dispose();
+    };
+  }, []);
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "resizeObserver-element",
+    ref: ref
+  });
+}

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

@@ -1,7 +1,20 @@
 import * as THREE from 'three';
+import AudioLike from '../../../shared-utils/AduioLike';
 export interface VideoAgentMeshOptions {
+    /**
+     * 自定义视频实例。
+     */
     videoInstance?: HTMLVideoElement;
+    /**
+     * 自定义音频实例。
+     */
     audioInstance?: HTMLAudioElement;
+    /**
+     * 是否开启音频预载能力。**仅对`.mp3`有效**。
+     *
+     * @description 开启预载能力后会通过 `Fetch/XHR` 方式将音频文件下载转成二进制 [`Blob`](https://developer.mozilla.org/zh-CN/docs/Web/API/Blob) 提供给多媒体实例。这样的好处是 **能够保障音视频播放过程中不卡顿**。 但在部分 iOS 系统中会存在兼容问题——播 25s 之后会静音（`muted` 为 `false`，但是没有声音）。
+     */
+    preload?: boolean;
 }
 /**
  * 视频经纪人MESH
@@ -12,8 +25,9 @@ export declare class VideoAgentMesh extends THREE.Mesh {
     freeze: boolean;
     paused: boolean;
     audioInstance: HTMLAudioElement;
+    audioLikeInstance: AudioLike;
     $removeEventListener: () => void;
-    get videoInstance(): HTMLAudioElement;
+    get mediaInstance(): HTMLAudioElement | HTMLVideoElement | AudioLike;
     /**
      *
      * @param width
@@ -24,7 +38,7 @@ export declare class VideoAgentMesh extends THREE.Mesh {
      */
     constructor(width: number, height: number, widthSegments: number, heightSegments: number, options?: VideoAgentMeshOptions);
     private update;
-    play(videoUrl?: string): Promise<unknown>;
+    play(videoUrl?: string, currentTime?: number, duration?: number): Promise<unknown>;
     /**
      * 转成毫秒，保障精准度
      */