@cc-component/cc-video 1.2.3 → 1.2.4

package/assets/video/base/VideoManager.ts

@@ -217,6 +217,7 @@ export class VideoManager {
         const isloop = false
         const onRead = param.onRead
         const onError = param.onError
+
         param.onRead = () => {
             console.warn('当前播放', name)
             onRead?.()
@@ -273,8 +274,8 @@ export class VideoManager {
             // 清理任务
             if (VideoManager.instance.Debug)
                 console.log('任务已结束', oldTask?.count);
-            if (!param.isLoop)
-                param.onFinish?.()
+            // if (!param.isLoop && !this.stopRequested)
+            //     param.onFinish?.()
             //this.playTasks.delete(taskId);
         });
     }

package/assets/video/base/VideoPlayTT.ts

@@ -87,22 +87,21 @@ export class VideoPlayTT extends BaseVideo {
         const windowInfo = tt.getSystemInfoSync();
         const { windowWidth, windowHeight } = windowInfo;
         let video = tt.createOffscreenVideo();
-        video.onError(self.videoError)
-        video.onEnded(self.videoEnd);
-        video.onTimeUpdate(self.onUpdate)
-        video.onPlay(self.onPlay)
-        video.onPause(self.onPause)
+        video.onError(self.videoError.bind(self))
+        video.onEnded(self.videoEnd.bind(self));
+        video.onTimeUpdate(self.onUpdate.bind(self))
+        video.onPlay(self.onPlay.bind(self))
+        video.onPause(self.onPause.bind(self))
         return video;
     }
 
     onCanplay() {
-        // if (this.is_stop) {
-        //     console.warn('停止')
-        //     return
-        // } else {
-        // }
-        if (VideoModule.IsDebug())
-            console.warn('准备好了')
+
+        if (!this.canPlay) {
+            if (VideoModule.IsDebug())
+                console.warn('准备好了')
+        }
+
         this.videoTexture = new Texture2D();
         this.imgAsset.reset(this.videoPlayer);
         this.videoTexture.image = this.imgAsset;
@@ -128,9 +127,8 @@ export class VideoPlayTT extends BaseVideo {
         this.videoPlayer = this.createVideoWX(name, true)
         this.actioveSelf(true)
 
-
-        this.videoPlayer.src = name;
         this.videoPlayer.onCanplay(this.onCanplay.bind(this))
+        this.videoPlayer.src = name;
 
         this.videoPlayer.loop = param.isLoop
         const is_skip = name === this.remoteURL;
@@ -262,7 +260,7 @@ export class VideoPlayTT extends BaseVideo {
     async destroyVideo() {
         if (this.videoPlayer) {
 
-
+            this.canPlay = false
             this.is_stop = true
             this.actioveSelf(false)
             this.video_sp.spriteFrame = null
@@ -300,7 +298,7 @@ export class VideoPlayTT extends BaseVideo {
             var y = param.y - size.height + param.height / 2 * ratio //* ratio// + param.height / 2 * ratio
             this.video_sp_ut.node.position = new Vec3(x, y, 0);
             this.video_sp_ut.contentSize = new Size(width, height);
-            console.error(param.y, size)
+            //  console.error(param.y, size)
         }
     }
 

package/assets/video/base/VideoPlayWX.ts

@@ -74,11 +74,11 @@ export class VideoPlayWX extends BaseVideo {
             objectFit: "cover",
             //zIndex: -9999,//好大的坑 官方API根本没写这个
         });
-        video.onError(self.videoError)
-        video.onEnded(self.videoEnd);
-        video.onTimeUpdate(self.onUpdate)
-        video.onPlay(self.onPlay)
-        video.onPause(self.onPause)
+        video.onError(self.videoError.bind(self))
+        video.onEnded(self.videoEnd.bind(self));
+        video.onTimeUpdate(self.onUpdate.bind(self))
+        video.onPlay(self.onPlay.bind(self))
+        video.onPause(self.onPause.bind(self))
         return video;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cc-component/cc-video",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "engine": ">=3.8.6",
     "description": "系统组件添加常用扩展方法",
     "main": "index.ts",