@galacean/effects-plugin-multimedia 2.8.7 → 2.8.9

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player multimedia plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 云垣
- * Version: v2.8.7
+ * Version: v2.8.9
  */
 
 'use strict';
@@ -653,20 +653,26 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
     };
     _proto.onAwake = function onAwake() {
         var _this = this;
-        var _this_item_composition, _this_item_composition1, _this_item_composition2;
         MaskableGraphic.prototype.onAwake.call(this);
-        (_this_item_composition = this.item.composition) == null ? void 0 : _this_item_composition.on("goto", function(option) {
+        var composition = this.item.composition;
+        if (!composition) {
+            return;
+        }
+        this.handleGoto = function(option) {
             _this.setCurrentTime(_this.item.time);
-        });
-        (_this_item_composition1 = this.item.composition) == null ? void 0 : _this_item_composition1.on("pause", function() {
+        };
+        this.handlePause = function() {
             _this.pauseVideo();
-        });
-        (_this_item_composition2 = this.item.composition) == null ? void 0 : _this_item_composition2.on("play", function(option) {
+        };
+        this.handlePlay = function(option) {
             if (_this.item.time < 0) {
                 return;
             }
             _this.playVideo();
-        });
+        };
+        composition.on("goto", this.handleGoto);
+        composition.on("pause", this.handlePause);
+        composition.on("play", this.handlePlay);
     };
     _proto.fromData = function fromData(data) {
         MaskableGraphic.prototype.fromData.call(this, data);
@@ -710,13 +716,13 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
         var _this_item = this.item, videoTime = _this_item.time, videoDuration = _this_item.duration, videoEndBehavior = _this_item.endBehavior, composition = _this_item.composition;
         EFFECTS.assertExist(composition);
         var _composition_rootItem = composition.rootItem, rootEndBehavior = _composition_rootItem.endBehavior, rootDuration = _composition_rootItem.duration;
-        // 判断是否处于“结束状态”：
+        // 判断是否处于"结束状态"：
         // - 视频时间为 0（未开始）
         // - 合成时间已达最大时长（播放完毕）
         // - 视频时间接近或等于其总时长（考虑容差阈值）
-        var isEnd = videoTime === 0 || composition.time === rootDuration || Math.abs(videoTime - videoDuration) <= this.threshold;
-        // 如果视频时间大于 0，且未到结束状态，并且尚未触发播放，则开始播放视频
-        if (videoTime > 0 && !isEnd && !this.played) {
+        var isEnd = videoTime === 0 || Math.abs(composition.time - rootDuration) <= this.threshold || Math.abs(videoTime - videoDuration) <= this.threshold;
+        // 如果视频时间大于等于 0，且未到结束状态，并且尚未触发播放，则开始播放视频
+        if (videoTime >= 0 && !isEnd && !this.played && this.isVideoActive) {
             this.playVideo();
         }
         // 当视频播放时间接近或超过其总时长时，根据其结束行为进行处理
@@ -727,10 +733,6 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
                     this.pauseVideo();
                 }
             }
-        // ios freeze issue
-        // else if (videoEndBehavior === spec.EndBehavior.destroy || videoEndBehavior === spec.EndBehavior.restart) {
-        //   this.setCurrentTime(0);
-        // }
         }
         // 判断整个合成是否接近播放完成
         // composition.time + threshold >= rootDuration 表示即将结束
@@ -847,15 +849,40 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
         this.video.pause();
     };
     _proto.onDestroy = function onDestroy() {
+        var _this_item;
         MaskableGraphic.prototype.onDestroy.call(this);
+        // 清理播放状态
         this.played = false;
         this.isPlayLoading = false;
         this.pendingPause = false;
+        this.isVideoActive = false;
+        // 清理video资源
         if (this.video) {
+            // 暂停视频
             this.video.pause();
-            this.video.src = "";
+            // 移除video源，帮助垃圾回收
+            this.video.removeAttribute("src");
             this.video.load();
+            // 清理video引用
+            this.video = undefined;
+        }
+        // 清理事件监听
+        var composition = (_this_item = this.item) == null ? void 0 : _this_item.composition;
+        if (composition) {
+            if (this.handleGoto) {
+                composition.off("goto", this.handleGoto);
+            }
+            if (this.handlePause) {
+                composition.off("pause", this.handlePause);
+            }
+            if (this.handlePlay) {
+                composition.off("play", this.handlePlay);
+            }
         }
+        // 清理处理器引用
+        this.handleGoto = undefined;
+        this.handlePause = undefined;
+        this.handlePlay = undefined;
     };
     _proto.onDisable = function onDisable() {
         MaskableGraphic.prototype.onDisable.call(this);
@@ -865,6 +892,11 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
     _proto.onEnable = function onEnable() {
         MaskableGraphic.prototype.onEnable.call(this);
         this.isVideoActive = true;
+        this.played = false;
+        // 重播时确保视频同步到当前时间
+        if (this.video && this.item.composition) {
+            this.setCurrentTime(Math.max(0, this.item.time));
+        }
         this.playVideo();
     };
     return VideoComponent;
@@ -1212,7 +1244,7 @@ exports.AudioComponent = __decorate([
 
 /**
  * 插件版本号
- */ var version = "2.8.7";
+ */ var version = "2.8.9";
 EFFECTS.registerPlugin("video", VideoLoader);
 EFFECTS.registerPlugin("audio", AudioLoader);
 EFFECTS.logger.info("Plugin multimedia version: " + version + ".");