@realsee/dnalogel 2.11.0-alpha.1 → 2.11.0

package/libs/PanoTagPlugin/controller/index.js

@@ -1,51 +1,51 @@
-var V = Object.defineProperty, B = Object.defineProperties;
-var G = Object.getOwnPropertyDescriptors;
-var R = Object.getOwnPropertySymbols;
-var x = Object.prototype.hasOwnProperty, N = Object.prototype.propertyIsEnumerable;
-var P = (h, d, e) => d in h ? V(h, d, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[d] = e, p = (h, d) => {
-  for (var e in d || (d = {}))
-    x.call(d, e) && P(h, e, d[e]);
-  if (R)
-    for (var e of R(d))
-      N.call(d, e) && P(h, e, d[e]);
+var I = Object.defineProperty, L = Object.defineProperties;
+var V = Object.getOwnPropertyDescriptors;
+var F = Object.getOwnPropertySymbols;
+var B = Object.prototype.hasOwnProperty, x = Object.prototype.propertyIsEnumerable;
+var P = (h, a, e) => a in h ? I(h, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[a] = e, p = (h, a) => {
+  for (var e in a || (a = {}))
+    B.call(a, e) && P(h, e, a[e]);
+  if (F)
+    for (var e of F(a))
+      x.call(a, e) && P(h, e, a[e]);
   return h;
-}, T = (h, d) => B(h, G(d));
-var l = (h, d, e) => (P(h, typeof d != "symbol" ? d + "" : d, e), e);
-var c = (h, d, e) => new Promise((t, i) => {
+}, T = (h, a) => L(h, V(a));
+var l = (h, a, e) => (P(h, typeof a != "symbol" ? a + "" : a, e), e);
+var c = (h, a, e) => new Promise((t, i) => {
   var s = (n) => {
     try {
       r(e.next(n));
-    } catch (a) {
-      i(a);
+    } catch (d) {
+      i(d);
     }
   }, o = (n) => {
     try {
       r(e.throw(n));
-    } catch (a) {
-      i(a);
+    } catch (d) {
+      i(d);
     }
   }, r = (n) => n.done ? t(n.value) : Promise.resolve(n.value).then(s, o);
-  r((e = e.apply(h, d)).next());
+  r((e = e.apply(h, a)).next());
 });
-import { Subscribe as W } from "@realsee/five";
-import { Group as E, Vector3 as A, Matrix4 as S, Quaternion as z } from "three";
+import { Subscribe as G } from "@realsee/five";
+import { Group as E, Vector3 as A, Matrix4 as S, Quaternion as N } from "three";
 import v from "object-assign-deep";
-import { writable as _ } from "../../vendor/svelte/store/index.js";
-import $ from "../Components/TagContainer.js";
-import q from "../Components/Tag/index.js";
+import { writable as W } from "../../vendor/svelte/store/index.js";
+import z from "../Components/TagContainer.js";
+import _ from "../Components/Tag/index.js";
 import { arrayPositionToVector3 as C } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import { addDebugPoints as H } from "../utils/addDebugPoints.js";
+import { addDebugPoints as $ } from "../utils/addDebugPoints.js";
 import { planeNormal as k } from "../utils/planeNormal.js";
 import { isMediaModelTag as m } from "../utils/tag/tagCheck.js";
-import { waitFiveModelLoaded as J } from "../utils/actionAfterFiveModelLoad.js";
-import { normalPositionToPositions as Q } from "../utils/normalPositionToPositions.js";
+import { waitFiveModelLoaded as q } from "../utils/actionAfterFiveModelLoad.js";
+import { normalPositionToPositions as H } from "../utils/normalPositionToPositions.js";
 import { debounce as j } from "../utils/debounce.js";
-import { throttle as X } from "../utils/throttle.js";
+import { throttle as J } from "../utils/throttle.js";
 import { resizeObserver as U } from "../utils/resizeObserver.js";
-import { TagComputer as K } from "./TagComputer.js";
-import { CSS3DRenderPlugin as Y } from "../../CSS3DRenderPlugin/index.js";
-import Z from "../utils/tag/format.js";
-import { generateBlankAudio as I, AudioNamespace as L } from "../../shared-utils/audio.js";
+import { TagComputer as Q } from "./TagComputer.js";
+import { CSS3DRenderPlugin as X } from "../../CSS3DRenderPlugin/index.js";
+import K from "../utils/tag/format.js";
+import { generateBlankAudio as Y, AudioNamespace as Z } from "../../shared-utils/audio.js";
 import { loadGLTF as ee } from "../../shared-utils/three/GLTFLoader.js";
 import "../../vendor/svelte/internal/index.js";
 import "../Components/TagItem.js";
@@ -141,7 +141,7 @@ import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "@realsee/five/gltf-loader";
 const M = "DnalogelPlugin-PanoTagPlugin", te = !1, di = (h) => `${M}--${h}`;
-class li extends K {
+class li extends Q {
   constructor(e, t) {
     super(e);
     l(this, "state", { enabled: !0, visible: !0 });
@@ -150,7 +150,7 @@ class li extends K {
     l(this, "css3DRenderPlugin");
     l(this, "TagContainerSvelte");
     l(this, "temporaryState", { visible: !0 });
-    l(this, "mediaStore", _({
+    l(this, "mediaStore", W({
       currentMediaElement: null
     }));
     l(this, "group", new E());
@@ -185,16 +185,16 @@ class li extends K {
       const t = e.data.modelUrl;
       if (!t)
         return;
-      const i = ee(t).then((a) => Object.assign(a.scene, { customID: e.id, isTagModel: !0 }));
+      const i = ee(t).then((d) => Object.assign(d.scene, { customID: e.id, isTagModel: !0 }));
       e.model = { promise: i };
       const s = yield i;
       if (((n = e.model) == null ? void 0 : n.promise) !== i || (e.model.object = s, !this.tags.includes(e)))
         return;
       s.visible = e.state.visible, new S().fromArray(e.matrix).decompose(s.position, s.quaternion, s.scale), s.updateWorldMatrix(!0, !0), this.getVisibleByFloorIndex(e) || (s.visible = !1);
-      const r = this.gltfObjectGroup.children.find((a) => a.customID === e.id);
+      const r = this.gltfObjectGroup.children.find((d) => d.customID === e.id);
       return r && this.gltfObjectGroup.remove(r), this.gltfObjectGroup.add(s), this.updateTagCss3DObjectMatrix(e, s), s;
     }));
-    this.group.name = "PanoTagPluginModelGroup", this.gltfObjectGroup.name = "PanoTagPluginGLTFObjectGroup", this.group.add(this.gltfObjectGroup), this.params = p({ debug: !1, config: this.config }, t), this.debug = this.params.debug, this.config = this.params.config, I(1, { namespace: L.GetAudioDuration }), I(1, { namespace: L.PlayAudio }), Object.assign(window, { [`__PANOTAGPLUGIN_DEBUG_${Date.now()}__`]: this }), Object.assign(window, { __PANOTAGPLUGIN_DEBUG__: this }), this.state.enabled && this.five.scene.add(this.group);
+    this.group.name = "PanoTagPluginModelGroup", this.gltfObjectGroup.name = "PanoTagPluginGLTFObjectGroup", this.group.add(this.gltfObjectGroup), this.params = p({ debug: !1, config: this.config }, t), this.debug = this.params.debug, this.config = this.params.config, Y(1, { namespace: Z.PlayAudio }), Object.assign(window, { [`__PANOTAGPLUGIN_DEBUG_${Date.now()}__`]: this }), Object.assign(window, { __PANOTAGPLUGIN_DEBUG__: this }), this.state.enabled && this.five.scene.add(this.group);
   }
   load(e, t) {
     return c(this, null, function* () {
@@ -206,7 +206,7 @@ class li extends K {
       const i = yield this.addTag(e.tagList, t);
       if (this.debug)
         try {
-          H(this.five, this.tags);
+          $(this.five, this.tags);
         } catch (r) {
           console.error(r);
         }
@@ -219,12 +219,12 @@ class li extends K {
         const r = this.getTagConfig(o);
         return T(p({}, o), {
           state: p({ visible: void 0, unfolded: te }, r.initialState),
-          hooks: new W(),
+          hooks: new G(),
           clickable: r.clickable,
           mergedConfig: r
         });
       }).filter((o) => o.position);
-      return s.forEach(Z), this.tags.push(...s), J(this.five).then(() => {
+      return s.forEach(K), this.tags.push(...s), q(this.five).then(() => {
         var o, r, n;
         return this.store.eventListenerDisposer && ((r = (o = this.store).eventListenerDisposer) == null || r.call(o)), this.state.enabled && (this.store.eventListenerDisposer = this.addEventListener()), this.addResizeListener(), this.checkPanelTag(), this.setVisibleAndUnfolded({ withAnimation: (n = t == null ? void 0 : t.withAnimation) != null ? n : !0 }).then(() => this.updateRenderAllTags()), this.updateRenderAllTags(), this.addMediaModelTag(s);
       });
@@ -270,8 +270,8 @@ class li extends K {
   dispose() {
     var e, t, i, s, o, r;
     this.pauseCurrentMedia(), this.disposeAllCSS3DContainer(), (e = this.TagContainerSvelte) == null || e.$destroy(), this.filter3DTag().forEach((n) => {
-      var a;
-      return (a = n.tag3DContentSvelte) == null ? void 0 : a.svelteApp.$destroy();
+      var d;
+      return (d = n.tag3DContentSvelte) == null ? void 0 : d.svelteApp.$destroy();
     }), this.tags = [], (t = this.store.disposers) == null || t.forEach((n) => n == null ? void 0 : n()), this.store.disposers = [], this.store.disposed = !0, (s = (i = this.store).eventListenerDisposer) == null || s.call(i), this.store.eventListenerDisposer = void 0, (r = (o = this.store).resizeObserverDisposer) == null || r.call(o), this.store.resizeObserverDisposer = void 0, this.store.resizeObserverDisposerAdding = !1, this.five.scene.remove(this.group), this.group.remove(...this.group.children), this.gltfObjectGroup.remove(...this.gltfObjectGroup.children), this.clearCache(), this.five.needsRender = !0, this.hooks.emit("dispose");
   }
   setState(e, t) {
@@ -316,25 +316,20 @@ class li extends K {
     this.mediaStore.set({ currentMediaElement: null });
   }
   updateTagCss3DObjectMatrix(e, t) {
-    var D, w, O, F;
-    const i = (O = (w = (D = e.mergedConfig) == null ? void 0 : D.tag3DConfig) == null ? void 0 : w.ratio) != null ? O : 216e-5, s = (F = e.tag3DContentSvelte) == null ? void 0 : F.domContainer.css3DObject;
+    var D, w, R, O;
+    const i = (R = (w = (D = e.mergedConfig) == null ? void 0 : D.tag3DConfig) == null ? void 0 : w.ratio) != null ? R : 216e-5, s = (O = e.tag3DContentSvelte) == null ? void 0 : O.domContainer.css3DObject;
     if (!s)
       return;
     const o = m(e) ? e.data.mediaPosition : e.position;
     t.updateWorldMatrix(!1, !1);
-    const r = t.matrixWorld, n = new A().fromArray(o[0]), a = new A().fromArray(o[2]), f = new A().lerpVectors(n, a, 0.5).add(new A(0, 0, 5e-4)), g = new S().setPosition(f), y = new S().makeScale(i, i, i), b = new S().multiply(r).multiply(g).multiply(y);
+    const r = t.matrixWorld, n = new A().fromArray(o[0]), d = new A().fromArray(o[2]), f = new A().lerpVectors(n, d, 0.5).add(new A(0, 0, 5e-4)), g = new S().setPosition(f), y = new S().makeScale(i, i, i), b = new S().multiply(r).multiply(g).multiply(y);
     b.decompose(s.position, s.quaternion, s.scale);
     const u = s.opacityMesh;
     !u || b.decompose(u.position, u.quaternion, u.scale);
   }
   updateTagCss3DObjectVisible(e) {
-    var s, o, r, n, a;
-    const t = (s = e.tag3DContentSvelte) == null ? void 0 : s.domContainer.css3DObject;
-    if (!t)
-      return;
-    t.visible = (r = (o = e.state) == null ? void 0 : o.visible) != null ? r : !0;
-    const i = t.opacityMesh;
-    !i || (i.visible = (a = (n = e.state) == null ? void 0 : n.visible) != null ? a : !0);
+    var t, i, s, o, r;
+    (r = (i = (t = e.tag3DContentSvelte) == null ? void 0 : t.domContainer) == null ? void 0 : i.css3DObject) == null || r.setVisible(this.state.visible && ((o = (s = e.state) == null ? void 0 : s.visible) != null ? o : !0)), this.five.needsRender = !0;
   }
   setVisibleAndUnfolded() {
     return c(this, arguments, function* ({ withAnimation: e } = { withAnimation: !1 }) {
@@ -347,10 +342,10 @@ class li extends K {
     });
   }
   handleShow() {
-    this.state.visible = !0, this.updateTagContainerVisible();
+    this.state.visible = !0, this.group.visible = !0, this.updateTagContainerVisible(), this.five.needsRender = !0;
   }
   handleHide() {
-    this.pauseCurrentMedia(), this.state.visible = !1, this.updateTagContainerVisible();
+    this.pauseCurrentMedia(), this.state.visible = !1, this.group.visible = !1, this.updateTagContainerVisible(), this.five.needsRender = !0;
   }
   handleEnable() {
     this.state.enabled = !0, this.store.eventListenerDisposer = this.addEventListener(), this.updateRenderAllTags();
@@ -363,9 +358,9 @@ class li extends K {
     });
   }
   addEventListener() {
-    const { five: e, hooks: t } = this, i = this.handleFiveWantsMoveToPano.bind(this), s = this.handleFiveModeChange.bind(this), o = this.handleFiveCameraUpdate.bind(this), r = this.handleFiveCameraUpdateDebounce(), n = this.handleFivePanoArrived.bind(this), a = this.loadVideoFirstFrame.bind(this), f = this.clickhandler.bind(this), g = this.five.currentMode;
-    return this.handleFiveModeChange(g), this.handleFivePanoArrived(), e.on("wantsMoveToPano", i), e.on("modeChange", s), e.on("initAnimationEnded", this.handleFiveInitAnimationEnded), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", o), e.on("cameraUpdate", r), e.on("panoArrived", n), e.on("panoArrived", a), t.on("click", f), () => {
-      e.off("wantsMoveToPano", i), e.off("modeChange", s), e.off("initAnimationEnded", this.handleFiveInitAnimationEnded), e.off("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.off("cameraUpdate", o), e.off("cameraUpdate", r), e.off("panoArrived", n), e.off("panoArrived", a), t.off("click", f), this.store.eventListenerDisposer = void 0;
+    const { five: e, hooks: t } = this, i = this.handleFiveWantsMoveToPano.bind(this), s = this.handleFiveModeChange.bind(this), o = this.handleFiveCameraUpdate.bind(this), r = this.handleFiveCameraUpdateDebounce(), n = this.handleFivePanoArrived.bind(this), d = this.loadVideoFirstFrame.bind(this), f = this.clickhandler.bind(this), g = this.five.currentMode;
+    return this.handleFiveModeChange(g), this.handleFivePanoArrived(), e.on("wantsMoveToPano", i), e.on("modeChange", s), e.on("initAnimationEnded", this.handleFiveInitAnimationEnded), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", o), e.on("cameraUpdate", r), e.on("panoArrived", n), e.on("panoArrived", d), t.on("click", f), () => {
+      e.off("wantsMoveToPano", i), e.off("modeChange", s), e.off("initAnimationEnded", this.handleFiveInitAnimationEnded), e.off("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.off("cameraUpdate", o), e.off("cameraUpdate", r), e.off("panoArrived", n), e.off("panoArrived", d), t.off("click", f), this.store.eventListenerDisposer = void 0;
     };
   }
   loadVideoFirstFrame() {
@@ -387,7 +382,7 @@ class li extends K {
     }, i = () => {
       !this.state.enabled || this.hide();
     }, { observe: s, unobserve: o } = U(
-      X(() => {
+      J(() => {
         !this.store.resizeObserverDisposer || i();
       }, 500),
       e
@@ -436,8 +431,8 @@ class li extends K {
       temporaryState: this.temporaryState,
       withAnimation: this.store.visibleWithAnimation
     }), this.filter3DTag().forEach((t) => {
-      var i;
-      (i = t.tag3DContentSvelte) == null || i.svelteApp.$set({
+      var i, s, o, r;
+      (o = (s = (i = t.tag3DContentSvelte) == null ? void 0 : i.domContainer) == null ? void 0 : s.css3DObject) == null || o.setVisible(this.state.visible), (r = t.tag3DContentSvelte) == null || r.svelteApp.$set({
         state: this.state,
         temporaryState: this.temporaryState,
         withAnimation: this.store.visibleWithAnimation
@@ -478,7 +473,7 @@ class li extends K {
       const i = (t = this.five.getElement()) == null ? void 0 : t.parentElement;
       if (!i)
         return console.error("updateRenderPlaneTag: tag2DContainer not found");
-      this.TagContainerSvelte = new $({
+      this.TagContainerSvelte = new z({
         target: i,
         props: { hooks: this.hooks, tags: e, state: this.state, temporaryState: this.temporaryState, mediaStore: this.mediaStore }
       });
@@ -486,8 +481,8 @@ class li extends K {
   }
   updateRenderPlaneTag() {
     this.sort([...this.filterPlaneTag(), ...this.filter3DPointTag(), ...this.filterModelTag()]).forEach((t) => {
-      var n, a, f;
-      if (m(t) && ((n = t.model) == null ? void 0 : n.object) && this.updateTagCss3DObjectMatrix(t, (a = t.model) == null ? void 0 : a.object), t.tag3DContentSvelte) {
+      var n, d, f;
+      if (m(t) && ((n = t.model) == null ? void 0 : n.object) && this.updateTagCss3DObjectMatrix(t, (d = t.model) == null ? void 0 : d.object), t.tag3DContentSvelte) {
         const { svelteApp: g, domContainer: y, initialNormal: b, currentNormal: u } = t.tag3DContentSvelte;
         if (this.updateTagCss3DObjectVisible(t), g.$set({
           tag: t,
@@ -495,16 +490,16 @@ class li extends K {
           state: this.state,
           temporaryState: this.temporaryState
         }), !b.equals(u)) {
-          const D = new z().setFromUnitVectors(b, u);
+          const D = new N().setFromUnitVectors(b, u);
           y.css3DObject.setRotationFromQuaternion(D);
         }
         return;
       }
       if (((f = t.state) == null ? void 0 : f.visible) === !1)
         return;
-      if (this.css3DRenderPlugin || (this.css3DRenderPlugin = Y(this.five)), t.stickType === "3DPoint" && !t.normal)
+      if (this.css3DRenderPlugin || (this.css3DRenderPlugin = X(this.five)), t.stickType === "3DPoint" && !t.normal)
         return console.error("updateRenderPlaneTag: \u4E09\u7EF4\u70B9\u6807\u7B7E\u7F3A\u5C11\u6CD5\u5411\u91CF\uFF01");
-      const i = (() => t.stickType === "Plane" ? t.position : m(t) ? t.data.mediaPosition : Q(
+      const i = (() => t.stickType === "Plane" ? t.position : m(t) ? t.data.mediaPosition : H(
         this.five.camera.position,
         C(t.position),
         C(t.normal)
@@ -523,7 +518,7 @@ class li extends K {
         return;
       const o = this.getTagConfig(t).tag3DConfig, r = this.css3DRenderPlugin.create3DDomContainer(i, o);
       !r || (this.updateTagCss3DObjectVisible(t), this.store.css3DRenderDisposer.set(t.id, r.dispose), t.tag3DContentSvelte = {
-        svelteApp: new q({
+        svelteApp: new _({
           target: r.container,
           props: {
             tag: t,

package/libs/PanoTagPlugin/index.js

@@ -86,8 +86,8 @@ import "./utils/tag/tagCheck.js";
 import "./Components/Tag/AudioTag/index.js";
 import "./Components/Tag/AudioTag/AudioTag.js";
 import "./Components/Common/Audio.js";
-import "../shared-utils/audio.js";
 import "./utils/audio/SharedAudio.js";
+import "../shared-utils/audio.js";
 import "./Components/Common/Icon/audioIcon.js";
 import "./Components/Tag/AudioTag/AudioPlaneTag.js";
 import "./Components/Tag/MediaPlane.js";

package/libs/PanoTagPlugin/utils/audio/SharedAudio.d.ts

@@ -1,16 +1,17 @@
 export declare class SharedAudio extends Audio {
-    sharedAudioSrc?: string;
-    sharedAudioPaused: boolean;
     get paused(): boolean;
     get currentTime(): number;
+    private sharedAudioSrc?;
+    private sharedAudioPaused;
     private sharedAudioCurrentTime;
     private tryplaying;
     private audioInstance?;
     private eventListenerDisposer?;
     constructor(src?: string);
     play(): Promise<void>;
-    pause(): void;
+    pause(e?: Event): void;
     dispose(): void;
     private clear;
+    private endedHandler;
     private addEventListeners;
 }

package/libs/PanoTagPlugin/utils/audio/SharedAudio.js

@@ -1,32 +1,32 @@
-var y = Object.defineProperty;
-var L = (r, a, e) => a in r ? y(r, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[a] = e;
-var u = (r, a, e) => (L(r, typeof a != "symbol" ? a + "" : a, e), e);
-var m = (r, a, e) => new Promise((o, d) => {
-  var i = (n) => {
+var E = Object.defineProperty;
+var y = (u, r, e) => r in u ? E(u, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : u[r] = e;
+var c = (u, r, e) => (y(u, typeof r != "symbol" ? r + "" : r, e), e);
+var v = (u, r, e) => new Promise((s, a) => {
+  var h = (d) => {
     try {
-      h(e.next(n));
-    } catch (c) {
-      d(c);
+      o(e.next(d));
+    } catch (l) {
+      a(l);
     }
-  }, p = (n) => {
+  }, i = (d) => {
     try {
-      h(e.throw(n));
-    } catch (c) {
-      d(c);
+      o(e.throw(d));
+    } catch (l) {
+      a(l);
     }
-  }, h = (n) => n.done ? o(n.value) : Promise.resolve(n.value).then(i, p);
-  h((e = e.apply(r, a)).next());
+  }, o = (d) => d.done ? s(d.value) : Promise.resolve(d.value).then(h, i);
+  o((e = e.apply(u, r)).next());
 });
-import { getAudio as E, AudioNamespace as A } from "../../../shared-utils/audio.js";
-class f extends Audio {
+import { getAudio as L, AudioNamespace as A } from "../../../shared-utils/audio.js";
+class T extends Audio {
   constructor(e) {
     super();
-    u(this, "sharedAudioSrc");
-    u(this, "sharedAudioPaused", !0);
-    u(this, "sharedAudioCurrentTime", 0);
-    u(this, "tryplaying", !1);
-    u(this, "audioInstance");
-    u(this, "eventListenerDisposer");
+    c(this, "sharedAudioSrc");
+    c(this, "sharedAudioPaused", !0);
+    c(this, "sharedAudioCurrentTime", 0);
+    c(this, "tryplaying", !1);
+    c(this, "audioInstance");
+    c(this, "eventListenerDisposer");
     this.sharedAudioSrc = e;
   }
   get paused() {
@@ -37,72 +37,80 @@ class f extends Audio {
     return this.sharedAudioCurrentTime;
   }
   play() {
-    return m(this, null, function* () {
-      var e, o, d;
-      this.tryplaying || (this.tryplaying = !0, (!this.audioInstance || ((e = this.audioInstance) == null ? void 0 : e.realSrc) !== this.sharedAudioSrc) && (this.audioInstance = E(this.sharedAudioSrc, { namespace: A.PlayAudio })), (o = this.eventListenerDisposer) == null || o.call(this), this.eventListenerDisposer = this.addEventListeners(), this.audioInstance.currentTime = (d = this.currentTime) != null ? d : 0, this.audioInstance.play().then(() => {
+    return v(this, null, function* () {
+      var s, a, h;
+      if (this.tryplaying)
+        return;
+      this.tryplaying = !0, (!this.audioInstance || ((s = this.audioInstance) == null ? void 0 : s.realSrc) !== this.sharedAudioSrc) && (this.audioInstance = L(this.sharedAudioSrc, { namespace: A.PlayAudio })), (a = this.eventListenerDisposer) == null || a.call(this), this.eventListenerDisposer = this.addEventListeners(), this.audioInstance.currentTime = (h = this.currentTime) != null ? h : 0;
+      const e = this.audioInstance.currentTime !== this.currentTime;
+      this.audioInstance.play().then(() => {
         var i;
-        this.audioInstance.currentTime = (i = this.currentTime) != null ? i : 0, this.sharedAudioPaused = !1;
+        this.audioInstance.muted = !1, e && (this.audioInstance.currentTime = (i = this.currentTime) != null ? i : 0), this.sharedAudioPaused = !1;
       }).catch((i) => {
-        this.pause(), console.warn(i);
+        var o;
+        i.message === "The operation is not supported." ? console.error("Error: \u97F3\u9891\u6587\u4EF6\u53EF\u80FD\u635F\u574F\u6216\u4FEE\u6539\u8FC7\u6587\u4EF6\u540E\u7F00", i) : console.error("Error: error playing media in Safari", i), this.endedHandler(), (o = this.onerror) == null || o.call(this, i);
       }).finally(() => {
         this.tryplaying = !1;
-      }));
+      });
     });
   }
-  pause() {
-    !this.audioInstance || this.paused || (this.sharedAudioPaused = !0, this.audioInstance.addEventListener(
-      "pause",
-      () => {
-        var e;
-        (e = this.eventListenerDisposer) == null || e.call(this);
-      },
-      { once: !0 }
-    ), this.audioInstance.pause());
+  pause(e) {
+    var s;
+    if (!!this.audioInstance && !this.paused) {
+      if (this.sharedAudioPaused = !0, (s = this.eventListenerDisposer) == null || s.call(this), this.audioInstance.ended) {
+        this.endedHandler();
+        return;
+      }
+      this.audioInstance.paused || this.audioInstance.pause(), this.onpause(e != null ? e : new Event("pause")), this.clear();
+    }
   }
   dispose() {
-    this.clear(), this.audioInstance = void 0;
+    var e;
+    (e = this.eventListenerDisposer) == null || e.call(this), this.clear(), this.audioInstance = void 0;
   }
   clear() {
     var e;
     (e = this.audioInstance) == null || e.clear();
   }
+  endedHandler(e) {
+    var s, a;
+    (s = this.onended) == null || s.call(this, e != null ? e : new Event("ended")), (a = this.eventListenerDisposer) == null || a.call(this), this.sharedAudioPaused = !0, this.sharedAudioCurrentTime = 0, this.clear();
+  }
   addEventListeners() {
     const e = this.audioInstance;
     if (!e)
       return;
-    const o = (s) => {
-      var t;
-      this.sharedAudioCurrentTime = e.currentTime, this.sharedAudioPaused = e.paused, (t = this.ontimeupdate) == null || t.call(this, s);
-    }, d = (s) => {
-      var t;
-      return (t = this.onplay) == null ? void 0 : t.call(this, s);
-    }, i = (s) => {
+    const s = (n) => {
       var t;
-      (t = this.onpause) == null || t.call(this, s), this.sharedAudioPaused = !0, this.clear();
-    }, p = (s) => {
+      console.debug("ontimeupdate", e.currentTime, e.paused, e.ended), this.sharedAudioCurrentTime = e.currentTime, (t = this.ontimeupdate) == null || t.call(this, n);
+    }, a = (n) => {
       var t;
-      (t = this.onended) == null || t.call(this, s), this.sharedAudioPaused = !0, this.sharedAudioCurrentTime = 0;
-    }, h = (s) => {
+      e.isBlankAudio || (this.sharedAudioPaused = !1, (t = this.onplay) == null || t.call(this, n));
+    }, h = (n) => {
+      this.pause(n);
+    }, i = (n) => {
+      this.endedHandler(n);
+    }, o = (n) => {
       var t;
-      return (t = this.onerror) == null ? void 0 : t.call(this, s);
-    }, n = (s) => {
+      this.sharedAudioPaused = !0, (t = this.onerror) == null || t.call(this, n);
+    }, d = (n) => {
       var t;
-      return (t = this.oncanplay) == null ? void 0 : t.call(this, s);
-    }, c = (s) => {
+      return (t = this.oncanplay) == null ? void 0 : t.call(this, n);
+    }, l = (n) => {
       var t;
-      return (t = this.oncanplaythrough) == null ? void 0 : t.call(this, s);
-    }, l = (s) => {
+      return (t = this.oncanplaythrough) == null ? void 0 : t.call(this, n);
+    }, p = (n) => {
       var t;
-      return (t = this.onloadeddata) == null ? void 0 : t.call(this, s);
-    }, v = (s) => {
+      return (t = this.onloadeddata) == null ? void 0 : t.call(this, n);
+    }, m = (n) => {
       var t;
-      return (t = this.onloadedmetadata) == null ? void 0 : t.call(this, s);
+      return (t = this.onloadedmetadata) == null ? void 0 : t.call(this, n);
     };
-    return e.addEventListener("timeupdate", o), e.addEventListener("play", d), e.addEventListener("pause", i), e.addEventListener("ended", p), e.addEventListener("error", h), e.addEventListener("canplay", n), e.addEventListener("canplaythrough", c), e.addEventListener("loadeddata", l), e.addEventListener("loadedmetadata", v), () => {
-      e.removeEventListener("timeupdate", o), e.removeEventListener("play", d), e.removeEventListener("pause", i), e.removeEventListener("ended", p), e.removeEventListener("error", h), e.removeEventListener("canplay", n), e.removeEventListener("canplaythrough", c), e.removeEventListener("loadeddata", l), e.removeEventListener("loadedmetadata", v);
+    return e.addEventListener("timeupdate", s), e.addEventListener("play", a), e.addEventListener("pause", h), e.addEventListener("ended", i), e.addEventListener("error", o), e.addEventListener("canplay", d), e.addEventListener("canplaythrough", l), e.addEventListener("loadeddata", p), e.addEventListener("loadedmetadata", m), () => {
+      e.removeEventListener("timeupdate", s), e.removeEventListener("play", a), e.removeEventListener("pause", h), e.removeEventListener("ended", i), e.removeEventListener("error", o), e.removeEventListener("canplay", d), e.removeEventListener("canplaythrough", l), e.removeEventListener("loadeddata", p), e.removeEventListener("loadedmetadata", m);
     };
   }
 }
 export {
-  f as SharedAudio
+  T as SharedAudio
 };

package/libs/PanoVideoPlugin/VideoMeshController.d.ts

@@ -36,6 +36,8 @@ export declare class VideoMeshController {
     private videoMesh;
     private _enabled;
     private _disposed;
+    /** 视频资源是否满足播放条件 */
+    private videoDataLoaded;
     /** 视频是否曾经播放过 */
     private hasVideoEverPlayed;
     /** 自动 render five 的销毁函数
@@ -80,7 +82,10 @@ export declare class VideoMeshController {
     private onFiveModeChange;
     /** Five mode change 动画结束 */
     private onFiveInitAnimationEnded;
+    /** Five Canvas 点击 */
     private onFiveWantsTapGesture;
+    /** video canplaythrough 事件触发 */
+    private onVideoDataLoaded;
     /** video playing 事件触发
      * @remarks
      * 事件触发时机：
@@ -89,6 +94,8 @@ export declare class VideoMeshController {
      * @link https://developer.mozilla.org/en-US/docs/Web/HTML/Element/video
      */
     private onVideoPlaying;
+    /** 触发 playing 和 canplaythrough */
+    private onVideoPlayingAndLoaded;
     /** video pause 事件触发 */
     private onVideoPaused;
     /** 控制台打印警告 */