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

package/assets/lib/tableView/ListViewPageLoop.ts.meta

@@ -0,0 +1 @@
+{"ver":"4.0.24","importer":"typescript","imported":true,"uuid":"75405e06-7406-42a4-9fbd-3bc9aac788d4","files":[],"subMetas":{},"userData":{}}

package/assets/lib/tableView/TableView.ts

@@ -0,0 +1,82 @@
+import { _decorator, Component, Enum, find, Gradient, Graphics, instantiate, Mask, Node, NodePool, Pool, Prefab, ScrollView, Size, UITransform, utils, v2, v3 } from 'cc';
+import { IIndexPath, ILayout, IListView } from './IListView';
+import { collection_view_scroll_direction, ListView, node_element_comp, scroll_config } from './ListView';
+import { ListViewPageLoop } from './ListViewPageLoop';
+import { ListViewPage } from './ListViewPage';
+const { ccclass, property } = _decorator;
+@ccclass('TableView')
+export class TableView extends Component {
+
+    @property({ type: scroll_config, visible: true, displayName: `配置滚动` })
+    config: scroll_config = new scroll_config();
+    public delegate: IListView
+    scrollView: ListView;
+    set isScroll(value: boolean) {
+        this.scrollView.isScroll = value;
+        if (value) {
+            this.scrollView.horizontal = this.config.scrollDirection == collection_view_scroll_direction.HORIZONTAL ? true : false;
+            this.scrollView.vertical = this.config.scrollDirection == collection_view_scroll_direction.HORIZONTAL ? false : true;
+        } else {
+            this.scrollView.horizontal = false
+            this.scrollView.vertical = false
+        }
+    };
+    get isScroll(): boolean {
+        return this.scrollView.isScroll;
+    };
+
+    get content(): Node {
+        return this.scrollView.content;
+    }
+
+    get isInit() {
+        return this.delegate ? true : false;
+    }
+    finish: Function;
+    //  view: Node;
+    protected onLoad(): void {
+        if (this.config.isLoop) {
+            this.scrollView = this.node.addComponent(ListViewPageLoop)
+        } else {
+            this.scrollView = this.node.addComponent(ListViewPage)
+        }
+        this.scrollView.elastic = false
+        this.scrollView.delegate = this.delegate;
+        this.scrollView.config = this.config;
+        this.scrollView.init();
+        this.finish?.()
+    }
+    init(delegate: IListView) {
+        this.delegate = delegate
+        //解决一些设置时间点慢的问题
+        if (this.scrollView) {
+            this.scrollView.delegate = delegate
+        }
+        console.error("列表初始化完成2")
+
+    }
+    onLoadFinish(call: () => void) {
+        this.finish = call
+    }
+
+    public reload() {
+        this.scrollView.reloadData()
+    }
+    public moveToRow(index: number, time = 0.2) {
+        this.scrollView.moveToRow(index, time)
+    }
+
+    //子类重写
+    dequeueReusableCell(identifier: string, indexPath: IIndexPath): Node {
+        return this.scrollView.dequeueReusableCell(identifier, indexPath)
+    }
+
+    /**通过代码注册Cell--有大量不一样的cell的时候使用 */
+    registerCell(list: { identifier: string, prefab: Prefab }[]) {
+        this.scrollView.config.registerCell.push(...list)
+    }
+
+
+}
+
+

package/assets/lib/tableView/TableView.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "f59aea52-42b6-4c91-9f9a-f57948a5f906",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

package/assets/lib/tableView.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "513ba65f-6911-4bc5-b798-4220320a0841",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

package/assets/{video.meta → lib.meta}

@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "3741d2b3-cfcc-4207-8ae0-5ed87dc637e6",
+  "uuid": "9b761f85-96f2-4a58-b97c-013ad8b48754",
   "files": [],
   "subMetas": {},
   "userData": {}

package/assets/platform/Interface.ts

@@ -1,19 +1,16 @@
-import { _decorator } from 'cc';
-import { AdsData, ButtonTouch, PositonData, SDKBuyParam, SDKLoginData, SDKStatus, TTBaseData, TTData, UserInfoData } from './base/SDKEnum';
+import { _decorator, Node } from 'cc';
+import { AdsCall, AdsData, ButtonTouch, PositonData, SDKBuyParam, SDKLoginData, SDKStatus, TTBaseData, TTData, UserInfoData } from './base/SDKEnum';
 import { ICreateUserInfoButton } from './wx/MiniSDK';
+import { SDKBase } from './base/SDKBase';
 declare global {
     namespace PlatfprmModule {
         /**小游戏：按钮触摸 需要在按钮onTouchEnd中调用的方法 使用这个属性*/
         const buttonTouch: ButtonTouch;
         //#region 通用==============
         /**模块初始化 */
-        export function Init(): Promise<void>
+        export function Init(): Promise<boolean>
         /**登录 */
         export function Login(data?: string): Promise<SDKLoginData>
-        /**退出登录 */
-        export function Logout(): Promise<SDKStatus>
-        /**支付--目前只有安卓接入了 */
-        export function Pay(param: SDKBuyParam): Promise<SDKStatus>
         /**抖音：打开侧边栏 
          * callBack: 从侧边栏点击进入 游戏回调
         */
@@ -25,16 +22,19 @@ declare global {
         /**激励视频初始化 */
         export function InitRewardedVideo(param: AdsData);
         /**激励视频显示 */
-        export function ShowRewardedVideo(): Promise<boolean>
+        export function ShowRewardedVideo(param: AdsCall): Promise<boolean>
         //开放数据域
         export function InitOpenDataLayout(node: Node)
         export function SendMessageToOpenData(params: { type: string, event: string })
         /** 更新开放数据榜单数据 */
         export function UpdateCloudRank(key: string, score: number): Promise<boolean>
         export function ShowRank(keyList: string[], openId?: string)
-        //#region 安卓相关===========
-
 
+        //#region 安卓相关===========
+        /**退出登录 */
+        export function Logout(): Promise<SDKStatus>
+        /**支付--目前只有安卓接入了 */
+        export function Pay(param: SDKBuyParam): Promise<SDKStatus>
 
         //#region 微信相关===========
         /**创建游戏圈按钮 */
@@ -65,6 +65,11 @@ declare global {
         export function CheckScene(scene?: string): Promise<boolean>
 
     }
+
+    namespace AndroidModule {
+        export function Init()
+    }
+
 }
 
 //暂时不用这种方式

package/assets/platform/android/AndroidModule.ts

@@ -0,0 +1,12 @@
+import { assetManager } from "cc"
+import { SDKBase } from "../base/SDKBase"
+import { AndroidSDK } from "./AndroidSDK"
+
+export class AndroidModule {
+
+    static Init() {
+        return new AndroidSDK()
+    }
+}
+
+window.AndroidModule = AndroidModule

package/assets/platform/android/AndroidModule.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "07fbf5f8-5364-4dfd-863b-f9a8e103bb3e",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

package/assets/platform/android/AndroidSDK.ts

@@ -80,8 +80,7 @@ export class AndroidSDK extends SDKBase {
             assetManager.loadBundle('android', (error, bundle) => {
                 if (error) {
                     console.error('加载bundle android 失败', error)
-                    resolve(true)
-
+                    resolve(false)
                 } else {
                     resolve(true)
                 }

package/assets/platform/base/PlatfprmModule.ts

@@ -1,5 +1,4 @@
 import { sys, Node } from "cc";
-import { AndroidSDK } from "../android/AndroidSDK";
 import { TTSDK } from "./TTSDK";
 import { SDKBase } from "./SDKBase";
 import { EditorSDK } from "./EditorSDK";
@@ -7,7 +6,7 @@ import { WXSDK } from "./WXSDK";
 import { AdsCall, AdsData, ButtonTouch, SDKBuyParam, SDKStatus, TTBaseData, TTData, UserInfoData } from "./SDKEnum";
 import { ICreateUserInfoButton } from "../wx/MiniSDK";
 import { UITransform } from "cc";
-
+import { assetManager } from "cc";
 
 export class PlatfprmModule {
     static _instance: PlatfprmModule = null;
@@ -26,23 +25,38 @@ export class PlatfprmModule {
         wx_button_subscribe: false
     };
 
-    Init(): Promise<boolean> {
+    static async Init(): Promise<boolean> {
+        console.error("Init")
         switch (sys.platform) {
             case sys.Platform.BYTEDANCE_MINI_GAME:
-                this.sdk = new TTSDK();
+                PlatfprmModule.instance.sdk = new TTSDK();
                 break;
             case sys.Platform.WECHAT_GAME:
             case sys.Platform.WECHAT_MINI_PROGRAM:
-                this.sdk = new WXSDK();
+                PlatfprmModule.instance.sdk = new WXSDK();
                 break;
             case sys.Platform.ANDROID:
-                this.sdk = new AndroidSDK();
+                await PlatfprmModule.LoadBundle("android");
+                PlatfprmModule.instance.sdk = AndroidModule.Init();
                 break;
             default:
-                this.sdk = new EditorSDK();
+                PlatfprmModule.instance.sdk = new EditorSDK();
                 break;
         }
-        return this.sdk.init();
+        return PlatfprmModule.instance.sdk.init();
+    }
+    static LoadBundle(name: string): Promise<any> {
+        return new Promise<any>((resolve, reject) => {
+            assetManager.loadBundle(name, (error, bundle) => {
+                if (error) {
+                    console.error('加载bundle android 失败', error)
+                    resolve(null)
+                } else {
+                    console.log('加载bundle android 成功')
+                    resolve(bundle)
+                }
+            })
+        })
     }
 
     static Login(param?: any) {
@@ -53,85 +67,86 @@ export class PlatfprmModule {
     }
     /**支付--目前只有安卓接入了 */
     static Pay(param: SDKBuyParam): Promise<SDKStatus> {
-        return PlatfprmModule.instance.sdk.pay(param);
+        return PlatfprmModule.instance.sdk.pay?.(param);
     }
     static NavigateToScene(param?: { scene?: string, callBack?: () => void }) {
-        PlatfprmModule.instance.sdk.navigateToScene(param);//sidebar
+        PlatfprmModule.instance.sdk.navigateToScene?.(param);//sidebar
     }
 
     static RequestFeedSubscribe(call: (success: boolean) => void) {
         PlatfprmModule.instance.sdk.requestFeedSubscribe = call;
     }
     static ReportScene() {
-        PlatfprmModule.instance.sdk.reportScene();
+        PlatfprmModule.instance.sdk.reportScene?.();
     }
     static ReportFeed(data: TTBaseData) {
-        PlatfprmModule.instance.sdk.reportFeed(data.contentID, data.scene);
+        PlatfprmModule.instance.sdk.reportFeed?.(data.contentID, data.scene);
     }
 
     static StoreFeedData(data: TTData) {
-        PlatfprmModule.instance.sdk.storeFeedData(data);
+        PlatfprmModule.instance.sdk.storeFeedData?.(data);
     }
 
     static GetFeedData(contentID: string, scene: number): Promise<boolean> {
-        return PlatfprmModule.instance.sdk.getFeedData(contentID, scene);
+        return PlatfprmModule.instance.sdk.getFeedData?.(contentID, scene) ?? Promise.resolve(false);
     }
 
     static CheckFeedSubscribeStatus(): Promise<boolean> {
-        return PlatfprmModule.instance.sdk.checkFeedSubscribeStatus();
+        return PlatfprmModule.instance.sdk.checkFeedSubscribeStatus?.();
     }
     static CheckScene(): Promise<boolean> {
-        return PlatfprmModule.instance.sdk.checkScene();
+        return PlatfprmModule.instance.sdk.checkScene?.();
     }
     static AddShortcut() {
-        return PlatfprmModule.instance.sdk.addShortcut();
+        return PlatfprmModule.instance.sdk.addShortcut?.();
     }
 
     static ToPosition(node: Node) {
-        return PlatfprmModule.instance.sdk.toPosition(node);
+        return PlatfprmModule.instance.sdk.toPosition?.(node);
     }
     static CreateGameClubButton(node: Node) {
-        return PlatfprmModule.instance.sdk.createGameClubButton(node)
+        return PlatfprmModule.instance.sdk.createGameClubButton?.(node) ?? null
     }
 
     static CreateUserInfoButton(param: ICreateUserInfoButton, callBack: (userInfo: UserInfoData) => void) {
-        return PlatfprmModule.instance.sdk.createUserInfoButton(param, callBack);
+        return PlatfprmModule.instance.sdk.createUserInfoButton?.(param, callBack) ?? null;
     }
 
     //开放数据域
     static InitOpenDataLayout(node: Node) {
         const tr = node.getComponent(UITransform);
         const params = { x: 0, y: 0, width: tr.width, height: tr.height }
-        PlatfprmModule.instance.sdk.initOpenDataLayout(params);
+        PlatfprmModule.instance.sdk.initOpenDataLayout?.(params);
     }
     static SendMessageToOpenData(params: { type: string, event: string }) {
-        PlatfprmModule.instance.sdk.sendMessageToOpenData(params);
+        PlatfprmModule.instance.sdk.sendMessageToOpenData?.(params);
     }
     /** 更新微信开放数据榜单数据 */
     static UpdateCloudRank(key: string, score: number): Promise<boolean> {
-        return PlatfprmModule.instance.sdk.updateCloudRank(key, score);
+        return PlatfprmModule.instance.sdk.updateCloudRank?.(key, score);
     }
     static ShowRank(keyList: string[], openId?: string) {
-        return PlatfprmModule.instance.sdk.showRank(keyList, openId);
+        return PlatfprmModule.instance.sdk.showRank?.(keyList, openId);
     }
 
     /**检查是否显示隐私条约 */
     static CheckShowPrivacy(): Promise<boolean> {
-        return PlatfprmModule.instance.sdk.checkShowPrivacy();
+        return PlatfprmModule.instance.sdk.checkShowPrivacy?.();
     }
     static OpenPrivacyCUrl(): void {
-        PlatfprmModule.instance.sdk.openPrivacyCUrl();
+        PlatfprmModule.instance.sdk.openPrivacyCUrl?.();
     }
 
     /**激励视频初始化 */
     static InitRewardedVideo(param: AdsData) {
-        return PlatfprmModule.instance.sdk.initRewardedVideo(param);
+        return PlatfprmModule.instance.sdk.initRewardedVideo?.(param);
     }
 
     /**激励视频显示 */
     static ShowRewardedVideo(param: AdsCall) {
-        PlatfprmModule.instance.sdk.showRewardedVideo(param);
+        PlatfprmModule.instance.sdk.showRewardedVideo?.(param);
     }
 }
-
+//@ts-ignore
+window.PlatfprmModule = PlatfprmModule;
 

package/assets/platform/base/SDKBase.ts

@@ -37,8 +37,8 @@ export abstract class SDKBase {
     public updateCloudRank(key: string, score: number): Promise<boolean> { return null }
     public showRank(keyList: string[], openId?: string) { }
     //#region 微信相关 =========
-    public createUserInfoButton(param: ICreateUserInfoButton, callBack: (userInfo: UserInfoData) => void) { };
-    public createGameClubButton(node: Node) { }
+    public createUserInfoButton(param: ICreateUserInfoButton, callBack: (userInfo: UserInfoData) => void) { return null };
+    public createGameClubButton(node: Node) { return null }
     /**检查是否显示隐私条约 */
     public checkShowPrivacy(): Promise<boolean> { return null }
     public openPrivacyCUrl(): void { }

package/assets/platform/base/TTSDK.ts

@@ -54,7 +54,7 @@ export class TTSDK extends SDKBase {
         });
         tt.onHide(() => { });
         this.bindTouchEnd();
-        return null
+        return Promise.resolve(true);
     }
 
     public login(data?: string): Promise<SDKLoginData> {
@@ -74,16 +74,26 @@ export class TTSDK extends SDKBase {
         return null
     }
 
-
+    // 在 class 中定义
+    private _boundOnError: any = null;
+    private _boundOnClose: any = null;
     public initRewardedVideo(param: AdsData) {
-        //广告
-        this.videoAds = tt.createRewardedVideoAd({
-            adUnitId: param.adUnitId,
-        });
-        this.videoAds.offError(this.onError)
-        this.videoAds.offClose(this.onClose); //这里监听广告的close 事件
-        this.videoAds.onError(this.onError)
-        this.videoAds.onClose(this.onClose); //这里监听广告的close 事件
+        this.videoAds = tt.createRewardedVideoAd({ adUnitId: param.adUnitId });
+
+        // 先移除旧监听（如果存在）
+        if (this._boundOnError) {
+            this.videoAds.offError(this._boundOnError);
+        }
+        if (this._boundOnClose) {
+            this.videoAds.offClose(this._boundOnClose);
+        }
+
+        // 缓存 bind 后的函数
+        this._boundOnError = this.onError.bind(this);
+        this._boundOnClose = this.onClose.bind(this);
+
+        this.videoAds.onError(this._boundOnError);
+        this.videoAds.onClose(this._boundOnClose);
     }
 
     public showRewardedVideo(param: AdsCall) {
@@ -220,6 +230,7 @@ export class TTSDK extends SDKBase {
         } else {
             this.adsCall.fail?.('未完整观看视频')
         }
+        this.adsCall.close?.(res)
         // console.log("视频广告关闭：", res, res.isEnded);
     }
 

package/assets/platform/base/WXSDK.ts

@@ -16,10 +16,21 @@ export class WXSDK extends SDKBase {
 
         });
         this.bindTouchEnd()
-        return null
+        return Promise.resolve(true);
     }
     public login(data?: string): Promise<SDKLoginData> {
-        throw new Error('Method not implemented.');
+        return new Promise((resolve, reject) => {
+            wx.login({
+                success: function (res: any) {
+                    //console.warn(`获取code`, res);
+                    resolve({ success: true, code: res.code })
+                },
+                fail: function (err) {
+                    //  console.error(`获取code失败`, err);
+                    resolve({ success: false, code: "" })
+                }
+            });
+        })
     }
     public logout(): Promise<SDKStatus> {
         return null
@@ -30,20 +41,7 @@ export class WXSDK extends SDKBase {
 
     public showRewardedVideo(param: AdsCall) {
         this.adsCall = param;
-        miniSDK.showRewardedVideoAd({
-            onShow: () => {
-                this.adsCall.show?.()
-            },
-            onClose: (success: boolean) => {
-                if (success)
-                    this.adsCall.success?.()
-                else
-                    this.adsCall.close?.()
-            },
-            onError: (res) => {
-                this.adsCall.error?.(res)
-            },
-        })
+        miniSDK.showRewardedAd(param)
     }
 
 
@@ -87,6 +85,7 @@ export class WXSDK extends SDKBase {
     }
 
     public sendMessageToOpenData(params: { type: string, event: string }) {
+        console.log("发生", params);
         let openDataContext = wx.getOpenDataContext();
         openDataContext.postMessage(params)
     }

package/assets/platform/wx/MiniSDK.ts

@@ -1,5 +1,8 @@
 import { EventTarget, Game, Node, Rect, Sprite, Texture2D, UITransform, game, rect, screen, sys, view } from 'cc';
 import { DEV } from 'cc/env';
+import { AdsCall } from '../base/SDKEnum';
+type StringCallback = (str?: string) => void;
+
 
 export interface IInit {
     // 视频广告ID
@@ -351,7 +354,8 @@ export class MiniSDK {
             this.log('rewardedVideoAd onClose', res);
         });
 
-        this._rewardedVideoAd.onError(() => {
+        this._rewardedVideoAd.onError((res) => {
+            console.error("res", res)
             // 出错了
             this._rewardedVideoAdLoadState = 0;
         });
@@ -385,10 +389,10 @@ export class MiniSDK {
                 this.emit('RewardedVideoAdLoad');
                 this.log('loadRewardedVideoAd', 'success');
             })
-            .catch(() => {
+            .catch((res) => {
                 this._rewardedVideoAdLoadState = 0;
                 this.emit('RewardedVideoAdError');
-                this.log('loadRewardedVideoAd', 'error');
+                this.log('loadRewardedVideoAd', 'error', res);
             });
     }
 
@@ -430,6 +434,40 @@ export class MiniSDK {
         });
     }
 
+
+
+    private _onRewardedAdClose: (res) => void;
+    private _onRewardedAdError: (error) => void;
+    /** 展示激励视频广告 */
+    public showRewardedAd(call: AdsCall) {
+        if (!this._onRewardedAdClose) {
+            this._onRewardedAdClose = (res) => {
+                if (res.isEnded) {
+                    call.success?.();
+                } else {
+                    call.fail?.('未完整观看视频');
+                }
+                call.close?.(res);
+            }
+            this._onRewardedAdError = (err) => {
+                call.error?.(err);
+            }
+        }
+
+        let video = wx.createRewardedVideoAd({
+            adUnitId: this.videoID
+        });
+        video.offClose(this._onRewardedAdClose);
+        video.offError(this._onRewardedAdError);
+        video.onClose(this._onRewardedAdClose);
+        video.onError(this._onRewardedAdError);
+        video.load().then(() => {
+            video.show().then(() => {
+                call.show?.()
+            });
+        });
+    }
+
     /**************************** banner广告 ****************************/
     private _bannerAd = null;
     // banner是否加载完成

package/assets/platform/wx/wxmini.d.ts

@@ -521,11 +521,11 @@ declare namespace wx {
         /** 监听激励视频错误事件*/
         onError(callback: (res: { errMsg: string, errCode: 1000 | 1001 | 1002 | 1003 | 1004 | 1005 | 1006 | 1007 | 1008 }) => void): void;
         /** 取消监听激励视频错误事件*/
-        offError(callback: () => void): void;
+        offError(callback: (res) => void): void;
         /** 监听用户点击 关闭广告 按钮的事件*/
         onClose(callback: (res: { isEnded: boolean }) => void);
         /** 取消监听用户点击 关闭广告 按钮的事件*/
-        offClose(callback: () => void);
+        offClose(callback: (res) => void);
     }
 
     /**

package/index.ts

@@ -1,6 +1,13 @@
 // 负责导出assets下的模块，如: export { default } from './assets/xxx.ts'
 export { } from './assets/ex/ExCommon';
-export { } from './assets/video/Interface';
-export { } from './assets/platform/Interface';
-export { ReferenceCollector } from './assets/core/ReferenceCollector';
+
+export * from './assets/core/ViewModel';
+export * from './assets/core/ReferenceComponent';
+export * from './assets/core/BaseReference';
+export * from './assets/core/BaseViewModelData';
+
+
+export * from './assets/lib/tableView/TableView';
+export * from './assets/lib/collectView/lib_collect/yx-collection-view';
+export * from './assets/lib/collectView/lib_collect/yx-flow-layout';
 

package/package.json

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