@cc-component/cc-ex-component 1.0.9 → 1.1.1

package/assets/video/IVideo.ts

@@ -28,8 +28,8 @@ export interface IVideoParam {
      isLoop?: boolean,
      /**封面图片 */
      coverImage?: string,
-     /**是否不是全屏-保持原比例 */
-     isFullNot?: boolean,
+     /**全屏并且-保持原比例 */
+     isVideoFit?: boolean,
      /**视频封面 */
      onRead?: Function,
      /**播放完成 */

package/assets/video/VideoComponent.ts

@@ -15,7 +15,7 @@ export class VideoComponent extends Component {
     @property({ displayName: '封面目录' })
     cover_dir: string = 'cover_dir'
     @property({ displayName: '远程地址根目录', tooltip: '视频远程地址全路径示例: https://hcy-cdn-domestic.wyx.cn/online/comeback/xxx.mp4' })
-    remote_url: string = 'https://hcy-cdn-domestic.wyx.cn/online/comeback/'
+    remote_url: string = 'https://hcy-cdn-domestic.wyx.cn/online/comeback/video/'
     protected onLoad(): void {
         //const camera = director.getScene().getComponentsInChildren(Camera)[0]
         //   camera.clearColor = new Color(0, 0, 0, 0)

package/assets/video/VideoManager.ts

@@ -65,6 +65,7 @@ export class VideoManager {
         }
         return false;
     }
+
     remote_url = ""
     initVideo(param: InitParam) {
         this.paramInit = param;
@@ -142,6 +143,7 @@ export class VideoManager {
             if (VideoManager.instance.Debug)
                 console.log("视频准备好了")
             this.cover.node.active = false
+            this.seek(0)
             if (this.param.isLocal) {
                 //this.play()
                 //console.log("开始播放")
@@ -173,7 +175,7 @@ export class VideoManager {
         this.param = param;
         this.cover.spriteFrame = assetManager.getBundle(this.paramInit.bundle)?.get(`${this.paramInit.cover_dir}/${param.coverImage}/spriteFrame`)
         this.cover.node.active = this.cur_name === name ? false : true;
-        this.seek(0)
+
         this.baseVideo.loadVideo(name, param)
         this.cur_name = name;
     }
@@ -212,8 +214,10 @@ export class VideoManager {
         // if (VideoManager.instance.Debug)
         //     console.log('加载视频', name)
         const isloop = false
+        const onRead = param.onRead
         param.onRead = () => {
             console.warn('当前播放', name)
+            onRead?.()
             this.playVideo(param)
         }
         this.loadVideo(name, param)

package/assets/video/VideoModule.ts

@@ -2,6 +2,10 @@ import { _decorator, assetManager, Component, Node, randomRangeInt } from 'cc';
 import { VideoManager } from './VideoManager';
 import { InitParam, IVideoData, IVideoParam } from './IVideo';
 import { BYTEDANCE, WECHAT } from 'cc/env';
+import { sys } from 'cc';
+import { VideoPlayTT } from './VideoPlayTT';
+import { VideoPlayWeb } from './VideoPlayWeb';
+import { VideoPlayWX } from './VideoPlayWX';
 const { ccclass, property } = _decorator;
 
 
@@ -54,26 +58,32 @@ export class VideoModule {
     static StopVideoTask() { VideoManager.instance.stopVideoList() }
 
     /**提前加载视频 */
-    static LoadVideo(url: string, param: IVideoParam) {
+    static LoadVideo(name: string, param: IVideoParam) {
         VideoManager.instance.stopVideoList()
-        param.isLocal = !url.includes("http")
-        VideoManager.instance.loadVideo(url, param)
+        param.isLocal = VideoModule.isLocal(name)
+        VideoManager.instance.loadVideo(name, param)
     }
 
     /**播放单个视频 */
     static PlayVideo(video: IVideoData, param: IVideoParam) {
         VideoManager.instance.stopVideoList()
-        param.isLocal = !video.name.includes("http")
-        param.onRead = () => { VideoManager.instance.playVideo(param) }
+        param.isLocal = VideoModule.isLocal(video.name)
+        const onRead = param.onRead
+        param.onRead = () => {
+            onRead?.()
+            VideoManager.instance.playVideo(param)
+        }
         VideoManager.instance.loadVideo(video.name, param)
     }
 
     /** 播放多个视频*/
     static PlayVideoMore(video_list: IVideoData[], param: IVideoParam) {
         const url = video_list[0].name
-        param.isLocal = !url.includes("http")
+        param.isLocal = VideoModule.isLocal(url)
         if (param.isPlayTime) {
+            const onRead = param.onRead
             param.onRead = () => {
+                onRead?.()
                 VideoManager.instance.playVideoList(video_list, param)
             }
             VideoManager.instance.loadVideo(url, param)
@@ -82,13 +92,26 @@ export class VideoModule {
         }
     }
 
+    static isLocal(url: string) {
+        let result = url
+        switch (sys.platform) {
+            case sys.Platform.WECHAT_GAME:
+            case sys.Platform.BYTEDANCE_MINI_GAME:
+                result = `${VideoManager.instance.paramInit.remote_url}${url}`
+                break;
+            default:
+                // result = `${VideoManager.instance.paramInit.remote_url}${url}`
+                break;
+        }
+        return !result.includes("http")
+    }
 
 
     //#region 本地视频
     /**播放单个视频 -本地视频 */
     // public play(url: string, param: IVideoParam) {
     //     VideoManager.instance.loadVideo(url, {
-    //         isLoop: param.isLoop, isFullNot: param.isFullNot, isLocal: param.isLocal, isPlayTime: param.isPlayTime, coverImage: param.coverImage, onRead: () => {
+    //         isLoop: param.isLoop, isVideoFit: param.isVideoFit, isLocal: param.isLocal, isPlayTime: param.isPlayTime, coverImage: param.coverImage, onRead: () => {
     //             VideoManager.instance.playVideo({
     //                 isLoop: param.isLoop,
     //                 finish: param.onRead

package/assets/video/VideoPlayTT.ts

@@ -126,7 +126,7 @@ export class VideoPlayTT extends BaseVideo {
         this.is_stop = false;
         this.videoPlayer = this.createVideoWX(name, true)
         this.actioveSelf(true)
-        this.autoSize()
+
 
         this.videoPlayer.src = name;
         this.videoPlayer.onCanplay(this.onCanplay.bind(this))
@@ -134,6 +134,8 @@ export class VideoPlayTT extends BaseVideo {
         this.videoPlayer.loop = param.isLoop
         const is_skip = name === this.remoteURL;
         this.remoteURL = name;
+        if (!param.isTargetSize)
+            this.autoSize()
 
     }
 
@@ -194,12 +196,14 @@ export class VideoPlayTT extends BaseVideo {
         this.canPlay = false;
 
     }
+
     resume() {
         this.videoPlayer.resume();
         this.isPlaying = true
     }
 
     seek(time: number) {
+        //console.error('seek', time)
         this.videoPlayer.seek(time)
     }
 
@@ -283,6 +287,21 @@ export class VideoPlayTT extends BaseVideo {
     }
 
     setSize(param: { x: number, y: number, width: number, height: number }) {
+        if (this.videoPlayer) {
+            var size = view.getVisibleSize();
+            var designResolutionSize = view.getDesignResolutionSize();
+            var ratio = size.width / designResolutionSize.width;
+            var width = param.width * ratio;
+            var height = param.height * ratio;
+            var x = param.x * ratio - width / 2;;
+            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)
+        }
+    }
+
+    videoFit(param: { x: number, y: number, width: number, height: number }) {
         if (this.videoPlayer) {
             const size = view.getVisibleSize();
             const designResolutionSize = view.getDesignResolutionSize();
@@ -300,8 +319,8 @@ export class VideoPlayTT extends BaseVideo {
     autoSize() {
         if (this.videoPlayer) {
             let size = view.getVisibleSize();
-            if (this.param.isFullNot) {
-                this.setSize({ x: size.width / 2, y: -size.height / 2, width: 1080, height: 1920 });
+            if (this.param.isVideoFit) {
+                this.videoFit({ x: size.width / 2, y: -size.height / 2, width: 1080, height: 1920 });
                 return;
             }
             const designResolutionSize = view.getDesignResolutionSize()

package/assets/video/VideoPlayWX.ts

@@ -105,6 +105,8 @@ export class VideoPlayWX extends BaseVideo {
             this.play()
         }
         this.remoteURL = name;
+        if (!param.isTargetSize)
+            this.autoSize()
     }
 
     play(isloop?: boolean) {
@@ -200,6 +202,30 @@ export class VideoPlayWX extends BaseVideo {
     }
 
     setSize(param: { x: number, y: number, width: number, height: number }) {
+        if (this.videoPlayer) {
+            // fill	填充，视频拉伸填满整个容器，不保证保持原有长宽比例
+            // contain	包含，保持原有长宽比例。保证视频尺寸一定可以在容器里面放得下。因此，可能会有部分空白
+            // cover	覆盖，保持原有长宽比例。保证视频尺寸一定大于容器尺寸，宽度和高度至少有一个和容器一致。因此，视频有部分会看不见
+            const windowInfo = wx.getWindowInfo();
+            const { windowWidth, windowHeight } = windowInfo;
+            const designResolutionSize = view.getDesignResolutionSize()
+
+            const ratio = windowWidth / designResolutionSize.width
+            const width = param.width * ratio
+            const height = param.height * ratio
+            const x = param.x * ratio - width / 2
+            const y = param.y * ratio + param.height / 2 * ratio;
+            this.videoPlayer.objectFit = "fill"
+            this.videoPlayer.x = x;
+            this.videoPlayer.y = windowHeight - y;
+            this.videoPlayer.width = width
+            this.videoPlayer.height = height
+            this.videoPlayer.underGameView = true;
+
+        }
+    }
+
+    videoFit(param: { x: number, y: number, width: number, height: number }) {
         if (this.videoPlayer) {
             const windowInfo = wx.getWindowInfo();
             const { windowWidth, windowHeight } = windowInfo;
@@ -222,15 +248,17 @@ export class VideoPlayWX extends BaseVideo {
     // 节点位置适配
     autoSize() {
         if (this.videoPlayer) {
-            if (this.param.isFullNot) {
-                this.setSize({ x: 0, y: 0, width: 1080, height: 1920 })
-                return;
-            }
             const designResolutionSize = view.getDesignResolutionSize()
             let windowInfo = wx.getWindowInfo();
-            if (this.param.isFullNot) {
-                windowInfo = { windowWidth: 1080, windowHeight: 1920 }
+            if (this.param.isVideoFit) {
+                this.videoPlayer.objectFit = "contain";
+                this.videoPlayer.x = 0;
+                this.videoPlayer.y = 0;
+                this.videoPlayer.width = windowInfo.windowWidth;
+                this.videoPlayer.height = windowInfo.windowHeight;
+                return;
             }
+
             const { windowWidth, windowHeight } = windowInfo;
             this.videoPlayer.objectFit = "cover"
             this.videoPlayer.x = 0;

package/assets/video/VideoPlayWeb.ts

@@ -200,7 +200,7 @@ export class VideoPlayWeb extends BaseVideo {
     autoSize() {
         //const size = { width: 1080, height: 1920 }
         let screenSize = view.getVisibleSize(); // 获取当前屏幕尺寸
-        if (this.param.isFullNot) {
+        if (this.param.isVideoFit) {
             screenSize = new Size(1080, 1920)
         }
         const designResolutionSize = view.getDesignResolutionSize()
@@ -216,7 +216,7 @@ export class VideoPlayWeb extends BaseVideo {
 
         const x = width_w / 2
         let y = 0//-height / 4
-        if (this.param.isFullNot) {
+        if (this.param.isVideoFit) {
             y = height_h / 2
         }
 

package/package.json

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