@cc-component/cc-ex-component 1.1.6 → 1.1.8

package/assets/video/VideoManager.ts

@@ -1,399 +0,0 @@
-import { VideoPlayer, Node, sys, Sprite, UITransform, Size, view, assetManager, SpriteFrame, AssetManager, Asset } from 'cc';
-import { _decorator } from 'cc';
-import { BaseVideo, InitParam, IVideoData, IVideoParam } from './IVideo';
-import { VideoPlayWeb } from './VideoPlayWeb';
-import { VideoPlayWX } from './VideoPlayWX';
-import { WECHAT } from 'cc/env';
-import { VideoPlayTT } from './VideoPlayTT';
-const { ccclass, property } = _decorator;
-
-
-
-export class VideoManager {
-    Debug: boolean = false;
-    static _instance: VideoManager = null!;
-    public static get instance(): VideoManager {
-        if (!VideoManager._instance) {
-            VideoManager._instance = new VideoManager();
-        }
-        return VideoManager._instance;
-    }
-
-    isPlaying: boolean;
-    isloop: boolean;
-    baseVideo: BaseVideo;
-    // 添加一个标志位用于控制是否停止播放
-    private stopRequested: boolean = false;
-
-    /** 封面图 */
-    cover: Sprite;
-    isError: boolean = false;
-
-
-    currentIndex = 0;
-    currentList: IVideoData[] = [];
-    node: Node;
-    taskId = 'mainVideoList';
-    param: IVideoParam = {
-        isLoop: false,
-        isLocal: false,
-        isPlayTime: false,
-        isTargetSize: false
-    };
-    paramPlay: IVideoParam = {
-        isLoop: false,
-        isPlayTime: true,
-        isTargetSize: false
-    };
-    paramInit: InitParam;
-    cur_name = "";
-    get isLoop() {
-        if (this.paramPlay.isLoop === undefined || this.paramPlay.isLoop === null) {
-            return true
-        }
-        return this.paramPlay.isLoop
-    }
-    get isPlayTime() {
-        if (this.param.isPlayTime === undefined || this.param.isPlayTime === null) {
-            return false
-        }
-        return this.param.isPlayTime
-    }
-    get isMinGame() {
-        if (WECHAT) {
-            return true;
-        }
-        return false;
-    }
-
-    remote_url = ""
-    initVideo(param: InitParam) {
-        this.paramInit = param;
-        this.node = param.node;
-        this.cover = param.cover.getComponent(Sprite);
-        this.cover.node.active = false;
-        this.node.addChild(this.cover.node);
-        switch (sys.platform) {
-            case sys.Platform.ANDROID:
-                this.baseVideo = this.node.addComponent(VideoPlayWeb);
-                break;
-            case sys.Platform.WECHAT_GAME:
-                this.baseVideo = this.node.addComponent(VideoPlayWX);
-                break;
-            case sys.Platform.BYTEDANCE_MINI_GAME:
-                this.baseVideo = this.node.addComponent(VideoPlayTT);
-                break;
-            default:
-                this.baseVideo = this.node.addComponent(VideoPlayWeb);
-                break;
-        }
-        this.baseVideo.initVideo({ bundle: this.paramInit.bundle, dir: param.dir });
-        this.baseVideo.onTimeUpdate = async (data: { position: number, duration: number }) => {
-            if (this.currentList.length <= 0) {
-                return
-            }
-            const currentName = this.currentList[this.currentIndex]
-            //console.log("时间：", !this.baseVideo.getisPause(),data.position , currentName.end);
-            if (this.isLoop) {
-                if (data.position >= currentName.end_time && !this.baseVideo.getisPause()) {
-                    if (VideoManager.instance.Debug)
-                        console.log("播放结束：", currentName, !this.baseVideo.getisPause);
-                    await this.pause();
-                    this.currentIndex++;
-                    if (this.currentIndex === this.currentList.length) {
-                        this.currentIndex = 0;
-                    }
-                    this.playVideoTime(this.currentList[this.currentIndex])
-                }
-
-            } else {
-                if (data.position >= currentName.end_time && !this.baseVideo.getisPause()) {
-                    if (VideoManager.instance.Debug)
-                        console.log("播放结束：", currentName, !this.baseVideo.getisPause);
-                    await this.pause();
-                    this.paramPlay?.onFinish?.()
-                }
-            }
-
-        };
-        this.baseVideo.onError = (err) => {
-            this.isError = true;
-            console.error("视频报错了", err)
-        };
-
-        this.baseVideo.onVideoEnd = () => {
-            if (VideoManager.instance.Debug)
-                console.warn("视频播放完成")
-            const taskId = 'mainVideoList';
-            if (this.playTasks.has(taskId)) {
-                const task = this.playTasks.get(taskId);
-                if (task && task.finishPlayResolve) {
-                    task.finishPlayResolve();
-                    // 调用后清空引用
-                    // task.finishPlayResolve = null;
-                }
-            }
-            if (this.paramPlay?.onFinish) {
-                this.paramPlay.onFinish();
-                if (this.paramPlay.isLoop)
-                    this.paramPlay.onFinish = undefined;
-            }
-        };
-        this.baseVideo.onRead = () => {
-            if (VideoManager.instance.Debug)
-                console.log("视频准备好了")
-            this.cover.node.active = false
-            this.seek(0)
-            if (this.param.isLocal) {
-                //this.play()
-                //console.log("开始播放")
-                this.param?.onRead?.()
-            }
-            else if (this.param.isPlayTime) {
-                this.pause()
-                this.param?.onRead?.()
-            }
-            else {
-                this.pause()
-                this.param?.onRead?.()
-            }
-        };
-
-        this.autoSize()
-
-    }
-    // 在类中添加属性（您已经添加了）
-    coount = 0
-    // 修改 playTasks 的类型定义，增加 finishPlayResolve 字段
-    private playTasks: Map<string, { count: number, stop: () => void, finishPlayResolve: (() => void) | null }> = new Map();
-
-    // 在 playVideoList 方法中更新存储逻辑
-    loadVideo(name: string, param: IVideoParam): void {
-        name = param.isLocal ? name : `${this.remote_url}${name}.mp4`
-        if (VideoManager.instance.Debug)
-            console.log("加载视频：", name);
-        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.baseVideo.loadVideo(name, param)
-        this.cur_name = name;
-    }
-
-    private play(): void {
-        this.baseVideo.play()
-    }
-
-    setSize(param: { x: number, y: number, width: number, height: number }) {
-        this.baseVideo.setSize(param)
-    }
-    // 节点位置适配
-    autoSize() {
-        this.baseVideo.autoSize()
-    }
-
-
-    async pause() {
-        await this.baseVideo.pause()
-    }
-    stop(): void {
-    }
-    resume(): void {
-    }
-    seek(time: number): void {
-        this.baseVideo.seek(time)
-    }
-
-    /**播放单个视频 */
-    playVideo(param?: IVideoParam): void {
-        this.paramPlay = param
-        this.baseVideo.play(param?.isLoop)
-    }
-
-    playVideoOne(name: string, param: IVideoParam) {
-        // 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)
-    }
-
-    private playVideoTime(name: IVideoData): void {
-        if (VideoManager.instance.Debug)
-            console.warn('当前播放', name.start_time, name.end_time)
-
-        this.baseVideo.seek(name.start_time)
-        this.baseVideo.play()
-    }
-
-    //#region  新方案
-    async playVideoList(list: IVideoData[], param: IVideoParam) {
-        this.paramPlay = param
-
-
-        // 如果存在正在播放的任务，先停止它
-        const taskId = this.taskId
-        this.stopTask(taskId)
-        //新任务延迟1帧
-        setTimeout(async () => {
-            this.currentList = list;
-            this.currentIndex = 0
-            if (VideoManager.instance.Debug)
-                console.log("当前播放列表", JSON.stringify(list))
-            this.coount++;
-            // 重置状态
-            this.stopRequested = false;
-            this.isError = false;
-            // 创建停止函数
-            let isStopped = false;
-            const stopFunction = () => {
-                isStopped = true;
-                this.stopRequested = true;
-                if (this.baseVideo) {
-                    //this.baseVideo.pause();
-                }
-            };
-            if (VideoManager.instance.Debug)
-                console.log("开始任务", this.coount)
-            // 将停止函数和 finishPlayResolve 存储到Map中
-            this.playTasks.set(taskId, { count: this.coount, stop: stopFunction, finishPlayResolve: null });
-            const oldTask = this.playTasks.get(taskId);
-            // 调用原始的播放逻辑
-            await this._playVideoList(list, param, taskId);
-            // 清理任务
-            if (VideoManager.instance.Debug)
-                console.log('任务已结束', oldTask?.count);
-            if (!param.isLoop)
-                param.onFinish?.()
-            //this.playTasks.delete(taskId);
-        });
-    }
-
-    stopTask(taskId: string) {
-        if (this.playTasks.has(taskId)) {
-            let oldTask: any = this.playTasks.get(taskId);
-            if (oldTask) {
-                // 调用之前存储的 finishPlayResolve 来中断等待
-                if (oldTask.finishPlayResolve) {
-                    oldTask.finishPlayResolve();
-                }
-                oldTask.stop();
-            }
-            this.playTasks.delete(taskId);
-        }
-
-    }
-    // 在 _playVideoList 方法中更新 finishPlayResolve 的存储
-    async _playVideoList(list: IVideoData[], param: IVideoParam, taskId: string) {
-        // this.cover.node.active = true
-        for (let index = 0; index < list.length; index++) {
-            // 检查是否需要停止
-            if (this.stopRequested) {
-                if (VideoManager.instance.Debug)
-                    console.log("播放被停止");
-                break;
-            }
-            if (this.isError) { break; }
-            const name = list[index];
-            if (this.isPlayTime) {
-                this.playVideoTime(name)
-            } else {
-                this.playVideoOne(name.name, param)
-            }
-
-            // 更新 playTasks 中的 finishPlayResolve
-            await new Promise<void>((resolve, reject) => {
-                // 更新Map中的 finishPlayResolve 引用
-                if (this.playTasks.has(taskId)) {
-                    const task = this.playTasks.get(taskId);
-                    if (task) {
-                        task.finishPlayResolve = resolve;
-                    }
-                }
-            })
-
-            if (this.isError) { break; }
-            if (VideoManager.instance.Debug)
-                console.warn('停止', this.stopRequested)
-            if (this.stopRequested) {
-                break;
-            }
-        }
-        if (VideoManager.instance.Debug)
-            console.log('播放结束')
-        if (param.isLoop) {
-            // 同样检查停止请求
-            if (!this.stopRequested) {
-                this._playVideoList(list, param, taskId)
-            }
-        }
-    }
-
-
-    // 增加停止播放列表的方法
-    public stopVideoList() {
-        this.stopRequested = true;
-        this.stopTask(this.taskId)
-        this.baseVideo.destroyVideo()
-    }
-
-    async loadBundle(bundleName) {
-        let bundle = assetManager.getBundle(bundleName);
-        if (!bundle) {
-            bundle = await new Promise<AssetManager.Bundle>(resolve => {
-                assetManager.loadBundle(bundleName, (err, bundle) => {
-                    if (err) {
-
-                        console.error("没有bundle", bundleName, err)
-                        return
-                    } else {
-                        resolve(bundle)
-                    }
-                });
-            })
-        }
-    }
-    // 在 VideoManager 类中添加以下方法
-    /**加载视频 */
-    preLoadVideo(bundleName: string, dirs: string[], pro: (pro: number) => void) {
-        return new Promise<void>(async (resolve, reject) => {
-            let bundle = assetManager.getBundle(bundleName);
-            if (!bundle) {
-                bundle = await new Promise<AssetManager.Bundle>(resolve => {
-                    assetManager.loadBundle(bundleName, (err, bundle) => {
-                        if (err) {
-                            reject(err);
-                        } else {
-                            resolve(bundle)
-                        }
-                    });
-                })
-            }
-            let pro_num = 0
-
-            for (let index = 0; index < dirs.length; index++) {
-                const dir = dirs[index];
-                await new Promise<void>(resolve => {
-                    bundle.loadDir(dir, (fin, total) => {
-                        const value = fin / total * 100;
-                        pro?.(Math.floor(value));
-                    }, (err, assets) => {
-                        resolve()
-                    })
-                })
-                // let pro_add = (index + 1) / dirs.length
-                // pro_num = pro_add * 100
-                // pro?.(index);
-            }
-            resolve()
-        })
-    }
-}
-
-
-

package/assets/video/VideoManager.ts.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "4.0.24",
-  "importer": "typescript",
-  "imported": true,
-  "uuid": "a987e3ef-276e-48bf-ac02-62b00f26afc6",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

package/assets/video/VideoModule.ts

@@ -1,137 +0,0 @@
-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;
-
-
-export class VideoModule {
-    static _instance: VideoModule = null;
-    static get instance(): VideoModule {
-        if (!this._instance) {
-            this._instance = new VideoModule();
-        }
-        return this._instance;
-    }
-
-    get isMinGame() {
-        if (WECHAT || BYTEDANCE) {
-            return true
-        }
-        return false;
-    }
-    /**视频地址 */
-    remote_url = "https://hcy-cdn-domestic.wyx.cn/online/comeback/";
-    static async initVideo(param: InitParam) {
-        // if (BYTEDANCE) {
-        //     param.bg.active = true;
-        //     this.remote_url += "video_dy/"
-        // }
-        // else if (WECHAT) {
-        //     param.bg.active = false;
-        //     this.remote_url += "video_dy/"
-        // }
-        // else {
-        //     param.bg.active = false;
-        //     this.remote_url += "video/"
-        //     await VideoManager.instance.loadBundle(param.bundle)
-        // }
-        VideoManager.instance.remote_url = param.remote_url
-        VideoManager.instance.initVideo(param)
-        console.log("视频初始化完成")
-    }
-
-    static Debug(enabled: boolean) { VideoManager.instance.Debug = enabled }
-    /**视频设置到指定大小 */
-    static SetSize(param: { x: number, y: number, width: number, height: number }) { VideoManager.instance.setSize(param) }
-    /**节点位置适配-自动适配 */
-    static AutoSize() { VideoManager.instance.autoSize() }
-    /**暂停 */
-    static async Pause() { return await VideoManager.instance.pause() }
-    /**继续 */
-    static async Resume() { return await VideoManager.instance.resume() }
-    /**停止视频 */
-    static StopVideoTask() { VideoManager.instance.stopVideoList() }
-
-    /**提前加载视频 */
-    static LoadVideo(name: string, param: IVideoParam) {
-        VideoManager.instance.stopVideoList()
-        param.isLocal = VideoModule.isLocal(name)
-        VideoManager.instance.loadVideo(name, param)
-    }
-
-    /**播放单个视频 */
-    static PlayVideo(video: IVideoData, param: IVideoParam) {
-        VideoManager.instance.stopVideoList()
-        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 = VideoModule.isLocal(url)
-        if (param.isPlayTime) {
-            const onRead = param.onRead
-            param.onRead = () => {
-                onRead?.()
-                VideoManager.instance.playVideoList(video_list, param)
-            }
-            VideoManager.instance.loadVideo(url, param)
-        } else {
-            VideoManager.instance.playVideoList(video_list, param)
-        }
-    }
-
-    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, isVideoFit: param.isVideoFit, isLocal: param.isLocal, isPlayTime: param.isPlayTime, coverImage: param.coverImage, onRead: () => {
-    //             VideoManager.instance.playVideo({
-    //                 isLoop: param.isLoop,
-    //                 finish: param.onRead
-    //             })
-    //         }
-    //     })
-    // }
-
-
-    // //#region 网络视频 
-    // /**播放单个视频 --- */
-    // public playRemote(url: string, param: { isloop: boolean, coverImage: string, finish: Function }) {
-    //     VideoManager.instance.loadVideo(url, {
-    //         isLoop: param.isloop, isLocal: false, isPlayTime: false, coverImage: param.coverImage, onRead: () => {
-    //             VideoManager.instance.playVideo({
-    //                 isLoop: param.isloop,
-    //                 finish: param.finish
-    //             })
-    //         }
-    //     })
-    // }
-}
-window.VideoModule = VideoModule;

package/assets/video/VideoModule.ts.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "4.0.24",
-  "importer": "typescript",
-  "imported": true,
-  "uuid": "4f113e31-c657-4961-b12c-754c5d4bdb56",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}