@realsee/vreo 2.3.6 → 2.3.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/PlayController/createHTMLAudioElement.js +7 -13
- package/lib/PlayController/index.js +27 -95
- package/lib/Player/App.js +2 -28
- package/lib/Player/Controller.js +48 -132
- package/lib/Player/custom/SpatialScenePanel/index.js +45 -76
- package/lib/Player/hooks.js +1 -11
- package/lib/Player/index.js +34 -101
- package/lib/Player/modules/Drawer/index.js +2 -19
- package/lib/Player/modules/PopUp/index.js +2 -12
- package/lib/Player/modules/ResizeObserver/index.js +1 -9
- package/lib/Player/modules/VideoAgent/VideoAgentMesh.js +29 -123
- package/lib/Player/modules/VideoAgent/VideoAgentScene.js +15 -37
- package/lib/Player/modules/VideoAgent/index.js +2 -19
- package/lib/Player/modules/Wave/index.js +14 -43
- package/lib/Player/modules/keyframes/BgMusic/index.js +10 -28
- package/lib/Player/modules/keyframes/CameraMovement/index.js +6 -30
- package/lib/Player/modules/keyframes/InfoPanel/index.js +9 -39
- package/lib/Player/modules/keyframes/ModelVideo/index.js +6 -32
- package/lib/Player/modules/keyframes/PanoEffect/index.js +19 -52
- package/lib/Player/modules/keyframes/PanoEffect/lineAnime.js +1 -8
- package/lib/Player/modules/keyframes/PanoTag/index.js +5 -23
- package/lib/Player/modules/keyframes/PanoTextLabel/index.js +27 -57
- package/lib/Player/modules/keyframes/Prompter/index.js +15 -42
- package/lib/Player/modules/keyframes/UpdateVRPanorama/index.js +19 -26
- package/lib/Player/modules/keyframes/VideoEffect/index.js +18 -59
- package/lib/fivePlugins/CSS3DRenderPlugin/centerPoint.js +0 -2
- package/lib/fivePlugins/CSS3DRenderPlugin/createResizeObserver.js +0 -1
- package/lib/fivePlugins/CSS3DRenderPlugin/evenNumber.js +0 -1
- package/lib/fivePlugins/CSS3DRenderPlugin/index.js +21 -62
- package/lib/fivePlugins/CSS3DRenderPlugin/transformPositionToVector3.js +2 -5
- package/lib/fivePlugins/CameraMovementPlugin/index.js +20 -74
- package/lib/fivePlugins/CameraMovementPlugin/typings.js +0 -4
- package/lib/fivePlugins/ModelTVVideoPlugin/index.js +15 -69
- package/lib/index.js +0 -1
- package/lib/react/index.js +10 -41
- package/lib/shared-utils/Audio.js +35 -96
- package/lib/shared-utils/AudioLike.js +20 -56
- package/lib/shared-utils/Preloader.js +0 -7
- package/lib/shared-utils/addResizeListener.js +0 -5
- package/lib/shared-utils/animationFrame/BetterTween.js +19 -58
- package/lib/shared-utils/animationFrame/index.js +2 -10
- package/lib/shared-utils/animationFrame/tween.js +2 -11
- package/lib/shared-utils/createTransMatrix.js +5 -26
- package/lib/shared-utils/getFileExpandedName.js +0 -1
- package/lib/shared-utils/getMediaInfo.js +1 -10
- package/lib/shared-utils/setElementDataset.js +0 -2
- package/lib/typings/VreoUnit.js +0 -15
- package/package.json +4 -3
|
@@ -1,41 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
|
4
5
|
value: true
|
|
5
6
|
});
|
|
6
7
|
exports.createHTMLAudioElement = createHTMLAudioElement;
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
11
|
-
|
|
8
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
12
10
|
var BLANK_AUDIO = '' + 'data:audio/mpeg;base64,' + '//uQxAAAAAAAAAAAAAAAAAAAAAAASW5mbwAAAA8AAAADAAAGhgBVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVWqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqr///////////' + '////////////////////////////////8AAAA5TEFNRTMuOThyAc0AAAAAAAAAABSAJAiqQgAAg' + 'AAABobxtI73AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//uQxAACFEII9ACZ/sJZwWEoEb8w/////N//////Jcxj' + 'Hjf+7/v/H2PzCCFAiDtGeyBCIx7bJJ1mmEEMy6g8mm2c8nrGABB4h2Mkmn//4z/73u773R5qHHu' + '/j/w7Kxkzh5lWRWdsifCkNAnY9Zc1HvDAhjhSHdFkHFzLmabt/AQxSg2wwzLhHIJOBnAWwVY4zr' + 'hIYhhc2kvhYDfQ4hDi2Gmh5KyFn8EcGIrHAngNgIwVIEMf5bzbAiTRoAD///8z/KVhkkWEle6IX' + '+d/z4fvH3BShK1e5kmjkCMoxVmXhd4ROlTKo3iipasvTilY21q19ta30/v/0/idPX1v8PNxJL6r' + 'amnOVsdvMv2akO0iSYIzdJFirtzWXCZicS9vHqvSKyqm5XJBdqBwPxyfJdykhWTZ0G0ZyTZGpLK' + 'xsNwwoRhsx3tZfhwmeOBVISm3impAC/IT/8hP/EKEM1KMdVdVKM2rHV4x7HVXZvbVVKN/qq8CiV' + '9VL9jjH/6l6qf7MBCjZmOqsAibjcP+qqqv0oxqpa/NVW286hPo1nz2L/h8+jXt//uSxCmDU2IK/' + 'ECN98KKtE5IYzNoCfbw+u9i5r8PoadUMFPKqWL4LK3T/LCraMSHGkW4bpLXR/E6LlHOVQxmslKV' + 'J8IULktMN06N0FKCpHCoYsjC4F+Z0NVqdNFoGSTjSiyjzLdnZ2fNqTi2eHKONONKLMPMKLONKLM' + 'PQRJGlFxZRoKcJFAYEeIFiRQkUWUeYfef//Ko04soswso40UJAgMw8wosososy0EalnZyjQUGBR' + 'QGIFggOWUacWUeYmuadrZziQKKEgQsQLAhQkUJAgMQDghltLO1onp0cpkNInSFMqlYeSEJ5AHsq' + 'FdOwy1DA2sRmRJKxdKRfLhfLw5BzUxBTUUzLjk4LjJVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVUxBTUUzLjk4LjJVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVf/7ksRRA8AAAaQAAAAgAAA0gAAABFVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV' + 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVU=';
|
|
13
|
-
|
|
14
11
|
function createHTMLAudioElement() {
|
|
15
12
|
var ndAudio = document.querySelector('#vreo-playController-audio');
|
|
16
|
-
|
|
17
13
|
if (ndAudio) {
|
|
18
14
|
return ndAudio;
|
|
19
15
|
}
|
|
20
|
-
|
|
21
16
|
var audio = document.createElement('audio');
|
|
22
17
|
audio.style.display = 'none';
|
|
23
18
|
audio.setAttribute('id', 'vreo-playController-audio');
|
|
24
19
|
audio.controls = false;
|
|
25
20
|
document.body.appendChild(audio);
|
|
26
|
-
audio.src = BLANK_AUDIO;
|
|
21
|
+
audio.src = BLANK_AUDIO;
|
|
27
22
|
|
|
28
|
-
|
|
29
|
-
|
|
23
|
+
// 触发一次播放
|
|
24
|
+
Promise.resolve( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
|
|
25
|
+
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
30
26
|
while (1) {
|
|
31
27
|
switch (_context.prev = _context.next) {
|
|
32
28
|
case 0:
|
|
33
29
|
_context.next = 2;
|
|
34
30
|
return audio.play();
|
|
35
|
-
|
|
36
31
|
case 2:
|
|
37
32
|
return _context.abrupt("return", _context.sent);
|
|
38
|
-
|
|
39
33
|
case 3:
|
|
40
34
|
case "end":
|
|
41
35
|
return _context.stop();
|
|
@@ -1,98 +1,60 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.PlayController = void 0;
|
|
9
|
-
|
|
8
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
10
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
12
|
+
var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
|
|
13
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
14
|
+
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
15
|
+
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
16
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
17
|
var _five = require("@realsee/five");
|
|
11
|
-
|
|
12
18
|
var _animationFrame = require("../shared-utils/animationFrame");
|
|
13
|
-
|
|
14
19
|
var _createHTMLAudioElement = require("./createHTMLAudioElement");
|
|
15
|
-
|
|
16
|
-
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
17
|
-
|
|
18
|
-
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
19
|
-
|
|
20
|
-
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
21
|
-
|
|
22
|
-
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); } }
|
|
23
|
-
|
|
24
|
-
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
25
|
-
|
|
26
|
-
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); }
|
|
27
|
-
|
|
28
|
-
function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
|
|
29
|
-
|
|
30
|
-
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); }; }
|
|
31
|
-
|
|
32
|
-
function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
|
|
33
|
-
|
|
34
|
-
function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
|
|
35
|
-
|
|
20
|
+
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
|
|
36
21
|
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; } }
|
|
37
|
-
|
|
38
|
-
function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
|
|
39
|
-
|
|
40
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
41
|
-
|
|
42
22
|
var closures = {};
|
|
43
|
-
|
|
44
23
|
var PlayController = /*#__PURE__*/function (_Subscribe) {
|
|
45
|
-
|
|
46
|
-
|
|
24
|
+
(0, _inherits2["default"])(PlayController, _Subscribe);
|
|
47
25
|
var _super = _createSuper(PlayController);
|
|
48
|
-
|
|
49
26
|
function PlayController() {
|
|
50
27
|
var _this;
|
|
51
|
-
|
|
52
28
|
var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
53
|
-
|
|
54
|
-
_classCallCheck(this, PlayController);
|
|
55
|
-
|
|
29
|
+
(0, _classCallCheck2["default"])(this, PlayController);
|
|
56
30
|
_this = _super.call(this);
|
|
57
|
-
|
|
58
|
-
_defineProperty(_assertThisInitialized(_this), "config", {});
|
|
59
|
-
|
|
31
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "config", {});
|
|
60
32
|
if (!config.audio) {
|
|
61
33
|
config.audio = (0, _createHTMLAudioElement.createHTMLAudioElement)();
|
|
62
34
|
}
|
|
63
|
-
|
|
64
35
|
_this.config = Object.assign(_this.config, config);
|
|
65
|
-
|
|
66
36
|
closures.onPlaying = function () {
|
|
67
37
|
return _this.emit('playing');
|
|
68
38
|
};
|
|
69
|
-
|
|
70
39
|
closures.onPaused = function () {
|
|
71
40
|
return _this.emit('paused');
|
|
72
41
|
};
|
|
73
|
-
|
|
74
42
|
closures.onEnded = function () {
|
|
75
43
|
return _this.emit('paused', true);
|
|
76
44
|
};
|
|
77
|
-
|
|
78
45
|
_this.audioInstance.addEventListener('play', closures.onPlaying);
|
|
79
|
-
|
|
80
46
|
_this.audioInstance.addEventListener('pause', closures.onPaused);
|
|
81
|
-
|
|
82
47
|
_this.audioInstance.addEventListener('ended', closures.onEnded);
|
|
83
|
-
|
|
84
48
|
_this.stopInterval = (0, _animationFrame.requestAnimationFrameInterval)(function () {
|
|
85
49
|
if (_this.audioInstance.paused) {
|
|
86
50
|
return;
|
|
87
51
|
}
|
|
88
|
-
|
|
89
52
|
if (!_this.vreoUnit) {
|
|
90
53
|
return;
|
|
91
54
|
}
|
|
92
|
-
|
|
93
55
|
var keyframes = _this.vreoUnit.keyframes;
|
|
94
|
-
var currentTime = _this.currentTime;
|
|
95
|
-
|
|
56
|
+
var currentTime = _this.currentTime;
|
|
57
|
+
// 没有被解析过且开始时间低于当前时间戳 100ms
|
|
96
58
|
var currentKeyframes = keyframes.filter(function (keyframe) {
|
|
97
59
|
if (keyframe.parsed) return false;
|
|
98
60
|
var dur = currentTime - keyframe.start;
|
|
@@ -101,18 +63,16 @@ var PlayController = /*#__PURE__*/function (_Subscribe) {
|
|
|
101
63
|
currentKeyframes.forEach(function (keyframe) {
|
|
102
64
|
if (keyframe.parsed) return;
|
|
103
65
|
keyframe.parsed = true;
|
|
104
|
-
|
|
105
66
|
_this.emit(keyframe.type, keyframe, _this.currentTime);
|
|
106
67
|
});
|
|
107
68
|
});
|
|
108
69
|
return _this;
|
|
109
70
|
}
|
|
71
|
+
|
|
110
72
|
/**
|
|
111
73
|
* 载入数据
|
|
112
74
|
*/
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
_createClass(PlayController, [{
|
|
75
|
+
(0, _createClass2["default"])(PlayController, [{
|
|
116
76
|
key: "paused",
|
|
117
77
|
get: function get() {
|
|
118
78
|
return this.audioInstance.paused;
|
|
@@ -131,20 +91,19 @@ var PlayController = /*#__PURE__*/function (_Subscribe) {
|
|
|
131
91
|
key: "currentKeyframes",
|
|
132
92
|
get: function get() {
|
|
133
93
|
var _this2 = this;
|
|
134
|
-
|
|
135
94
|
if (!this.vreoUnit) return [];
|
|
136
|
-
var keyframes = this.vreoUnit.keyframes;
|
|
137
|
-
|
|
95
|
+
var keyframes = this.vreoUnit.keyframes;
|
|
96
|
+
// 没有被解析过且开始时间低于当前时间戳 100ms
|
|
138
97
|
return keyframes.filter(function (keyframe) {
|
|
139
98
|
if (keyframe.parsed) return false;
|
|
140
99
|
var dur = _this2.currentTime - keyframe.start;
|
|
141
100
|
return dur <= 100 && dur >= 0;
|
|
142
101
|
});
|
|
143
102
|
}
|
|
103
|
+
|
|
144
104
|
/**
|
|
145
105
|
* 音频时长 不一定能获取得到,建议以 VreoUnit 配置的时长为准。
|
|
146
106
|
*/
|
|
147
|
-
|
|
148
107
|
}, {
|
|
149
108
|
key: "duration",
|
|
150
109
|
get: function get() {
|
|
@@ -153,46 +112,35 @@ var PlayController = /*#__PURE__*/function (_Subscribe) {
|
|
|
153
112
|
}, {
|
|
154
113
|
key: "load",
|
|
155
114
|
value: function () {
|
|
156
|
-
var _load =
|
|
115
|
+
var _load = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(vreoUnit) {
|
|
157
116
|
var _this3 = this;
|
|
158
|
-
|
|
159
|
-
return regeneratorRuntime.wrap(function _callee$(_context) {
|
|
117
|
+
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
160
118
|
while (1) {
|
|
161
119
|
switch (_context.prev = _context.next) {
|
|
162
120
|
case 0:
|
|
163
121
|
this.vreoUnit = vreoUnit;
|
|
164
122
|
_context.next = 3;
|
|
165
123
|
return this.pause();
|
|
166
|
-
|
|
167
124
|
case 3:
|
|
168
125
|
_context.next = 5;
|
|
169
126
|
return new Promise(function (resolve, reject) {
|
|
170
127
|
if (vreoUnit.video.url === _this3.audioInstance.src) {
|
|
171
128
|
return resolve(true);
|
|
172
129
|
}
|
|
173
|
-
|
|
174
130
|
_this3.audioInstance.src = vreoUnit.video.url;
|
|
175
|
-
|
|
176
131
|
var canplaythrough = function canplaythrough() {
|
|
177
132
|
resolve(true);
|
|
178
|
-
|
|
179
133
|
_this3.audioInstance.removeEventListener('canplaythrough', canplaythrough);
|
|
180
134
|
};
|
|
181
|
-
|
|
182
135
|
var error = function error(err) {
|
|
183
136
|
reject(err);
|
|
184
|
-
|
|
185
137
|
_this3.audioInstance.removeEventListener('error', error);
|
|
186
138
|
};
|
|
187
|
-
|
|
188
139
|
_this3.audioInstance.addEventListener('canplaythrough', canplaythrough);
|
|
189
|
-
|
|
190
140
|
_this3.audioInstance.addEventListener('error', error);
|
|
191
141
|
});
|
|
192
|
-
|
|
193
142
|
case 5:
|
|
194
143
|
return _context.abrupt("return", _context.sent);
|
|
195
|
-
|
|
196
144
|
case 6:
|
|
197
145
|
case "end":
|
|
198
146
|
return _context.stop();
|
|
@@ -200,27 +148,23 @@ var PlayController = /*#__PURE__*/function (_Subscribe) {
|
|
|
200
148
|
}
|
|
201
149
|
}, _callee, this);
|
|
202
150
|
}));
|
|
203
|
-
|
|
204
151
|
function load(_x) {
|
|
205
152
|
return _load.apply(this, arguments);
|
|
206
153
|
}
|
|
207
|
-
|
|
208
154
|
return load;
|
|
209
155
|
}()
|
|
210
156
|
/**
|
|
211
157
|
* 播放
|
|
212
158
|
*/
|
|
213
|
-
|
|
214
159
|
}, {
|
|
215
160
|
key: "play",
|
|
216
161
|
value: function () {
|
|
217
|
-
var _play =
|
|
218
|
-
return
|
|
162
|
+
var _play = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
|
|
163
|
+
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
219
164
|
while (1) {
|
|
220
165
|
switch (_context2.prev = _context2.next) {
|
|
221
166
|
case 0:
|
|
222
167
|
closures.playPromise = this.audioInstance.play();
|
|
223
|
-
|
|
224
168
|
case 1:
|
|
225
169
|
case "end":
|
|
226
170
|
return _context2.stop();
|
|
@@ -228,22 +172,19 @@ var PlayController = /*#__PURE__*/function (_Subscribe) {
|
|
|
228
172
|
}
|
|
229
173
|
}, _callee2, this);
|
|
230
174
|
}));
|
|
231
|
-
|
|
232
175
|
function play() {
|
|
233
176
|
return _play.apply(this, arguments);
|
|
234
177
|
}
|
|
235
|
-
|
|
236
178
|
return play;
|
|
237
179
|
}()
|
|
238
180
|
/**
|
|
239
181
|
* 暂停
|
|
240
182
|
*/
|
|
241
|
-
|
|
242
183
|
}, {
|
|
243
184
|
key: "pause",
|
|
244
185
|
value: function () {
|
|
245
|
-
var _pause =
|
|
246
|
-
return
|
|
186
|
+
var _pause = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
|
|
187
|
+
return _regenerator["default"].wrap(function _callee3$(_context3) {
|
|
247
188
|
while (1) {
|
|
248
189
|
switch (_context3.prev = _context3.next) {
|
|
249
190
|
case 0:
|
|
@@ -251,13 +192,10 @@ var PlayController = /*#__PURE__*/function (_Subscribe) {
|
|
|
251
192
|
_context3.next = 3;
|
|
252
193
|
break;
|
|
253
194
|
}
|
|
254
|
-
|
|
255
195
|
_context3.next = 3;
|
|
256
196
|
return closures.playPromise;
|
|
257
|
-
|
|
258
197
|
case 3:
|
|
259
198
|
this.audioInstance.pause();
|
|
260
|
-
|
|
261
199
|
case 4:
|
|
262
200
|
case "end":
|
|
263
201
|
return _context3.stop();
|
|
@@ -265,11 +203,9 @@ var PlayController = /*#__PURE__*/function (_Subscribe) {
|
|
|
265
203
|
}
|
|
266
204
|
}, _callee3, this);
|
|
267
205
|
}));
|
|
268
|
-
|
|
269
206
|
function pause() {
|
|
270
207
|
return _pause.apply(this, arguments);
|
|
271
208
|
}
|
|
272
|
-
|
|
273
209
|
return pause;
|
|
274
210
|
}()
|
|
275
211
|
/**
|
|
@@ -278,7 +214,6 @@ var PlayController = /*#__PURE__*/function (_Subscribe) {
|
|
|
278
214
|
*
|
|
279
215
|
* @deprecated **慎重执行**
|
|
280
216
|
*/
|
|
281
|
-
|
|
282
217
|
}, {
|
|
283
218
|
key: "dispose",
|
|
284
219
|
value: function dispose() {
|
|
@@ -286,14 +221,11 @@ var PlayController = /*#__PURE__*/function (_Subscribe) {
|
|
|
286
221
|
this.audioInstance.removeEventListener('play', closures.onPlaying);
|
|
287
222
|
this.audioInstance.removeEventListener('pasue', closures.onPaused);
|
|
288
223
|
this.audioInstance.removeEventListener('ended', closures.onEnded);
|
|
289
|
-
|
|
290
224
|
if (this.stopInterval) {
|
|
291
225
|
this.stopInterval();
|
|
292
226
|
}
|
|
293
227
|
}
|
|
294
228
|
}]);
|
|
295
|
-
|
|
296
229
|
return PlayController;
|
|
297
230
|
}(_five.Subscribe);
|
|
298
|
-
|
|
299
231
|
exports.PlayController = PlayController;
|
package/lib/Player/App.js
CHANGED
|
@@ -1,55 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
8
|
exports.App = App;
|
|
9
|
-
|
|
10
9
|
var React = _interopRequireWildcard(require("react"));
|
|
11
|
-
|
|
12
10
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
13
|
-
|
|
14
11
|
var _mobxReact = require("mobx-react");
|
|
15
|
-
|
|
16
12
|
var _hooks = require("./hooks");
|
|
17
|
-
|
|
18
13
|
var _CameraMovement = require("./modules/keyframes/CameraMovement");
|
|
19
|
-
|
|
20
14
|
var _ResizeObserver = require("./modules/ResizeObserver");
|
|
21
|
-
|
|
22
15
|
var _InfoPanel = require("./modules/keyframes/InfoPanel");
|
|
23
|
-
|
|
24
16
|
var _ModelVideo = require("./modules/keyframes/ModelVideo");
|
|
25
|
-
|
|
26
17
|
var _PanoEffect = require("./modules/keyframes/PanoEffect");
|
|
27
|
-
|
|
28
18
|
var _PanoTag = require("./modules/keyframes/PanoTag");
|
|
29
|
-
|
|
30
19
|
var _PanoTextLabel = require("./modules/keyframes/PanoTextLabel");
|
|
31
|
-
|
|
32
20
|
var _Prompter = require("./modules/keyframes/Prompter");
|
|
33
|
-
|
|
34
21
|
var _UpdateVRPanorama = require("./modules/keyframes/UpdateVRPanorama");
|
|
35
|
-
|
|
36
22
|
var _VideoEffect = require("./modules/keyframes/VideoEffect");
|
|
37
|
-
|
|
38
23
|
var _VideoAgent = require("./modules/VideoAgent");
|
|
39
|
-
|
|
40
24
|
var _BgMusic = require("./modules/keyframes/BgMusic");
|
|
41
|
-
|
|
42
25
|
var _Wave = require("./modules/Wave");
|
|
43
|
-
|
|
44
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
45
|
-
|
|
46
26
|
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); }
|
|
47
|
-
|
|
48
27
|
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; }
|
|
49
|
-
|
|
50
28
|
var AppView = (0, _mobxReact.observer)(function (_ref) {
|
|
51
29
|
var _controller$configs, _controller$waveAppea, _controller$configs3, _controller$configs4;
|
|
52
|
-
|
|
53
30
|
var controller = _ref.controller;
|
|
54
31
|
return /*#__PURE__*/React.createElement("div", {
|
|
55
32
|
className: (0, _classnames["default"])('vreo-panel', {
|
|
@@ -64,12 +41,10 @@ var AppView = (0, _mobxReact.observer)(function (_ref) {
|
|
|
64
41
|
}), /*#__PURE__*/React.createElement(_VideoAgent.VideoAgent, {
|
|
65
42
|
onClick: function onClick() {
|
|
66
43
|
var _controller$configs2;
|
|
67
|
-
|
|
68
44
|
if ((_controller$configs2 = controller.configs) !== null && _controller$configs2 !== void 0 && _controller$configs2.onAvatarClick) {
|
|
69
45
|
controller.configs.onAvatarClick();
|
|
70
46
|
return;
|
|
71
47
|
}
|
|
72
|
-
|
|
73
48
|
if (controller.playing) {
|
|
74
49
|
controller.setPlaying(false);
|
|
75
50
|
} else {
|
|
@@ -79,7 +54,6 @@ var AppView = (0, _mobxReact.observer)(function (_ref) {
|
|
|
79
54
|
options: ((_controller$configs3 = controller.configs) === null || _controller$configs3 === void 0 ? void 0 : _controller$configs3.videoAgentMeshOptions) || {}
|
|
80
55
|
}), /*#__PURE__*/React.createElement(_Prompter.Prompter, null), (_controller$configs4 = controller.configs) === null || _controller$configs4 === void 0 ? void 0 : _controller$configs4.customPanelChildren));
|
|
81
56
|
});
|
|
82
|
-
|
|
83
57
|
function App() {
|
|
84
58
|
var controller = (0, _hooks.useController)();
|
|
85
59
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_ResizeObserver.ResizeObserver, null), /*#__PURE__*/React.createElement(_CameraMovement.CameraMovement, null), /*#__PURE__*/React.createElement(_ModelVideo.ModelVideo, null), /*#__PURE__*/React.createElement(_UpdateVRPanorama.UpdateVRPanorama, null), /*#__PURE__*/React.createElement(_VideoEffect.VideoEffect, null), /*#__PURE__*/React.createElement(_PanoTag.PanoTag, null), /*#__PURE__*/React.createElement(_PanoTextLabel.PanoTextLabel, null), /*#__PURE__*/React.createElement(_InfoPanel.InfoPanel, null), /*#__PURE__*/React.createElement(_PanoEffect.PanoEffect, null), /*#__PURE__*/React.createElement(_BgMusic.BgMusic, null)), /*#__PURE__*/React.createElement(AppView, {
|