@realsee/vreo 2.1.1-dev.0 → 2.2.0-alpha.1

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

@@ -19,7 +19,7 @@ function BgMusic() {
   React.useEffect(function () {
     var callback = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(keyframe, currentTime) {
-        var start, end, _currentTime, audio, cleanAudio;
+        var start, end, _currentTime, audio, cleanAudio, play;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -40,6 +40,7 @@ function BgMusic() {
                 audio.play();
                 cleanAudio = function cleanAudio() {
                   // audio.removeEventListener('canplaythrough', play)
+                  audio.removeEventListener('pause', play);
                   audio.pause();
                   audio.src = '';
                   // cleanTimeout()
@@ -48,13 +49,17 @@ function BgMusic() {
                 audio.addEventListener('ended', function () {
                   cleanAudio();
                 });
-                audio.addEventListener('pause', function () {
-                  audio.play();
-                });
+                play = function play() {
+                  if (audio.realSrc === keyframe.data.url) {
+                    // 有可能会被其他音轨打断
+                    audio.play();
+                  }
+                };
+                audio.addEventListener('pause', play);
                 controller.once('paused', function () {
                   cleanAudio();
                 });
-              case 11:
+              case 12:
               case "end":
                 return _context.stop();
             }

package/lib/Player/modules/keyframes/InfoPanel/index.d.ts

@@ -1,3 +1,2 @@
 /// <reference types="react" />
-export declare const isWX: boolean;
 export declare function InfoPanel(): JSX.Element;

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

@@ -5,16 +5,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InfoPanel = InfoPanel;
-exports.isWX = void 0;
 var React = _interopRequireWildcard(require("react"));
 var _VreoUnit = require("../../../../typings/VreoUnit");
 var _hooks = require("../../../hooks");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var isWX = navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1;
-exports.isWX = isWX;
+var isIOS = navigator.userAgent.toLowerCase().indexOf('iphone') !== -1;
+var isIOSorWX = isIOS || isWX;
 var videoElement = document.createElement('video');
-if (isWX) {
+if (isIOSorWX) {
   videoElement.playsInline = true;
   videoElement.classList.add('vreo-infoPanelVideo');
   document.body.addEventListener('click', function () {
@@ -39,7 +39,7 @@ function InfoPanelVideo(_ref2) {
     children = _ref2.children;
   var videoWrapperRef = React.useRef(null);
   React.useEffect(function () {
-    if (!isWX) return;
+    if (!isIOSorWX) return;
     if (!videoWrapperRef.current) return;
     videoElement.src = url;
     if (!videoWrapperRef.current.contains(videoElement)) {
@@ -54,7 +54,7 @@ function InfoPanelVideo(_ref2) {
   }, children, /*#__PURE__*/React.createElement("div", {
     className: "vreo-infoPanel-inner",
     ref: videoWrapperRef
-  }, !isWX && /*#__PURE__*/React.createElement("video", {
+  }, !isIOSorWX && /*#__PURE__*/React.createElement("video", {
     playsInline: true,
     autoPlay: true,
     src: url

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/vreo",
-  "version": "2.1.1-dev.0",
+  "version": "2.2.0-alpha.1",
   "description": "Vreo (VR Video 缩写) 是基于如视三维渲染引擎 Five 和 用户界面构建库 React 实现的如视 3D 空间剧本播放器。",
   "keywords": [
     "realsee",