@cc-component/cc-video 1.2.2 → 1.2.4

package/assets/video/VideoComponent.prefab

@@ -46,7 +46,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -540,
-      "y": 960,
+      "y": 960.0000000000001,
       "z": 0
     },
     "_lrot": {
@@ -528,7 +528,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1920.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -589,10 +589,11 @@
     "__prefab": {
       "__id__": 27
     },
+    "des": "项目设置-宏配置-ENABLE_TRANSPARENT_CANVAS,开启透明画布",
     "bundle_name": "video",
     "video_dir": "video_dir",
     "cover_dir": "cover_dir",
-    "remote_url": "https://hcy-cdn-domestic.wyx.cn/online/comeback/",
+    "remote_url": "https://hcy-cdn-domestic.wyx.cn/online/comeback/video_dy/",
     "_id": ""
   },
   {

package/assets/video/base/IVideo.ts

@@ -34,6 +34,8 @@ export interface IVideoParam {
      onRead?: Function,
      /**播放完成 */
      onFinish?: Function,
+     /**视频报错 */
+     onError?: Function,
      /**可不设置
       * 是本地视频还是远程，
       * 小游戏会设置为：远程视频，

package/assets/video/base/VideoManager.ts

@@ -119,6 +119,7 @@ export class VideoManager {
         this.baseVideo.onError = (err) => {
             this.isError = true;
             console.error("视频报错了 ", err)
+            this.param.onError?.()
         };
 
         this.baseVideo.onVideoEnd = () => {
@@ -215,11 +216,16 @@ export class VideoManager {
         //     console.log('加载视频', name)
         const isloop = false
         const onRead = param.onRead
+        const onError = param.onError
+
         param.onRead = () => {
             console.warn('当前播放', name)
             onRead?.()
             this.playVideo(param)
         }
+        param.onError = () => {
+            onError?.()
+        }
         this.loadVideo(name, param)
     }
 
@@ -268,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/VideoModule.ts

@@ -72,10 +72,14 @@ export class VideoModule {
         if (param.isLocal === undefined)
             param.isLocal = VideoModule.isLocal(video.name)
         const onRead = param.onRead
+        const onError = param.onError
         param.onRead = () => {
             onRead?.()
             VideoManager.instance.playVideo(param)
         }
+        param.onError = () => {
+            onError?.()
+        }
         VideoManager.instance.loadVideo(video.name, param)
     }
 
@@ -87,10 +91,14 @@ export class VideoModule {
 
         if (param.isPlayTime) {
             const onRead = param.onRead
+            const onError = param.onError
             param.onRead = () => {
                 onRead?.()
                 VideoManager.instance.playVideoList(video_list, param)
             }
+            param.onError = () => {
+                onError?.()
+            }
             VideoManager.instance.loadVideo(url, param)
         } else {
             VideoManager.instance.playVideoList(video_list, param)

package/assets/video/base/VideoPlayTT.ts

@@ -96,13 +96,12 @@ export class VideoPlayTT extends BaseVideo {
     }
 
     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/VideoPlayWeb.ts

@@ -45,9 +45,10 @@ export class VideoPlayWeb extends BaseVideo {
         this.videoPlayer = comp
         comp.enabled = true
         //  node.on(VideoPlayer.EventType.READY_TO_PLAY, this.readyPlay, this);
-        node.on(VideoPlayer.EventType.PLAYING, this.playIng.bind(this), this);
-        node.on(VideoPlayer.EventType.COMPLETED, this.videoEnd.bind(this), this);
-        node.on(VideoPlayer.EventType.ERROR, this.videoError.bind(this), this);
+        node.on(VideoPlayer.EventType.PLAYING, this.playIng, this);
+        node.on(VideoPlayer.EventType.COMPLETED, this.videoEnd, this);
+        node.on(VideoPlayer.EventType.ERROR, this.videoError, this);
+        console.error(node)
 
         comp.resourceType = VideoPlayer.ResourceType.REMOTE;
         comp.stayOnBottom = true;
@@ -78,6 +79,7 @@ export class VideoPlayWeb extends BaseVideo {
                 this.activeVideo(true)
                 if (!param.isTargetSize)
                     this.autoSize()
+                this.videoPlayer.clip = null
                 this.videoPlayer.clip = clip;
                 //this.videoPlayer.remoteURL = "";
                 this.videoPlayer.loop = param.isLoop
@@ -97,14 +99,15 @@ export class VideoPlayWeb extends BaseVideo {
             if (!param.isTargetSize)
                 this.autoSize()
             const is_skip = name === this.videoPlayer.remoteURL;
+            this.videoPlayer.remoteURL = ""
             this.videoPlayer.remoteURL = name;
             this.videoPlayer.resourceType = VideoPlayer.ResourceType.REMOTE;
             this.videoPlayer.loop = param.isLoop
-
             //console.warn('暂停', is_skip)
             if (is_skip) {
                 this.isReady = true;
                 this.readyPlay()
+                //this.play()
             } else {
                 this.play()
                 //this.pause();
@@ -160,7 +163,7 @@ export class VideoPlayWeb extends BaseVideo {
         // if (!this.isloop) this.node.off(VideoPlayer.EventType.READY_TO_PLAY, this.readyPlay, this);
         this.onRead?.(this)
     }
-    private videoError() {
+    private videoError(error: any) {
         this.onError?.();
     }
 

package/package.json

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