drgame-cc 1.0.45 → 1.0.46

package/drscript/PlatformAdapter.ts

@@ -1,96 +1,92 @@
-
-import { BtnExtra } from "./BtnExtra";
-import TvUi from "./core/TvUi";
-import { EVideoScene, IconStyle } from "./Define";
-import GameAnalytics, { AnalyticsAction, AnalyticsEvent, GameAnalyticsPlatform } from "./GameAnalytics";
-import { showRewardVideo } from "./Info";
+import { AdEvent, AdPlatform, AdSdk, AdType } from "./ad-sdk/ad-sdk";
+import { BtnExtra } from "./component/BtnExtra";
+import HelperWin from "./component/HelperWin";
+import { AnalyticsAction, AnalyticsEvent, EVideoScene, FingerStyle } from "./Define";
+import FocusVisualLayer from "./focus/FocusVisualLayer";
+import GameAnalytics from "./GameAnalytics";
 import { Loader } from "./Loader";
-import ToastManager from "./toast/ToastManager";
-import { InternalUitl } from "./InternalUitl";
+import { UIAdapter } from "./UIAdapter";
 import { WebBridge } from "./WebBridge";
-import { AdPlatform, AdSdk } from "./ad-sdk/ad-sdk";
-import HelperWin from "./HelperWin";
-/** 平台适配器,名字有点长防止和Platform，Adapter冲突 */
+
+/** 平台适配器，公共 API 入口 */
 export class PlatformAdapter {
-    private static readonly version = "1.0.36";
-    private static readonly designWidth = 1920;
-    private static readonly designHeight = 1080;
-    private static webBridge: WebBridge;
-    private static _canWatchVideo: boolean;
-    private static _isVIP: boolean;
-    private static _zhName: string;
+    /** 焦点管理 */
+    public static focus = UIAdapter.focus;
+    /** 返回键管理 */
+    public static back = UIAdapter.back;
+    /** WebBridge */
+    public static get webBridge() { return UIAdapter.webBridge; }
+
+    private static contentId: string = "";
+
+    // ========================================================================
+    // 初始化
+    // ========================================================================
+
     /** 初始化
      * @param cnName 中文名称
-     * @param minigameID 小游戏ID,文档地址:https://doc.weixin.qq.com/sheet/e3_AcEAlgaLALsCNiuHzH2NOQGCjVc3a?scode=AOcA0AdfAAoSqmh5BfAQIA6AYEAB4&tab=BB08J2
+     * @param minigameID 小游戏ID
      */
-    public static async init(cnName: string, minigameID: number, focusIcon: IconStyle) {
-        this._zhName = cnName;
-        this.webBridge = new WebBridge();
-        var platform = GameAnalyticsPlatform.XiaomiTv;//平台由sdk后续处理
-        var appItem = GameAnalytics.getAppItem(platform);
-        var contentId = minigameID.toString();//InternalUitl.getChineseInitials(cnName);
-        console.log(`[sdk-version] ${this.version}`);
-        TvUi.init({
-            cpId: contentId,
-            version: this.version,
-            designWidth: this.designWidth,
-            designHeight: this.designHeight,
-            enableCursor: true,
-            configPath: "drres/config/default",
-            focus: {
-                enabled: true,
-                defaultIconKey: focusIcon
-            },
-            adSdk: {
-                platform: platform
-            },
-            ads: {
-                reward: {
-                    enabled: true,
-                    mode: "reward",
-                    channels: [
-                        { type: "aggregate", priority: 1, reward_type: "reward" },
-                        { type: "mock", priority: 100 }
-                    ]
-                },
-                popup: {
-                    enabled: true,
-                    mode: "popup",
-                    channels: [
-                        { type: "aggregate", priority: 1 },
-                        { type: "mock", priority: 100 }
-                    ]
-                },
-                game: {
-                    enabled: true,
-                    mode: "popup",
-                    channels: [
-                        { type: "aggregate", priority: 1 },
-                        { type: "mock", priority: 100 }
-                    ]
-                }
-            }
-        });
+    public static async init(cnName: string, minigameID: number, focusIcon: FingerStyle) {
+        FocusVisualLayer.setStyle(focusIcon);
+        UIAdapter._zhName = cnName;
+        var platform: AdPlatform = AdPlatform.None;
+        UIAdapter.webBridge = new WebBridge();
+        if (UIAdapter.webBridge.isAvailable()) {
+        } else if (this.isXiaomi) {
+            platform = AdPlatform.Xiaomi;
+        }
+        this.contentId = minigameID.toString();
+        console.log(`[sdk-version] ${UIAdapter.version}`);
+        UIAdapter.init({ focusEnabled: true });
 
         GameAnalytics.init({
-            platform: GameAnalyticsPlatform.XiaomiTv,
-            app_item: appItem,
-            content_type: "游戏", // 游戏（乐窝的游戏，这个字段都固定上报游戏）
-            content_id: contentId, // 游戏ID（具体乐窝的游戏ID）
-            content_title: cnName, // 游戏名（具体的乐窝游戏名）
+            app_item: "25",
+            content_type: "游戏",
+            content_id: this.contentId,
+            content_title: cnName,
         });
-        if (this.isCocos)
-            await ToastManager.Inst.init();
+        if (PlatformAdapter.isCocos) {
+            UIAdapter.toastPool = new cc.NodePool();
+            UIAdapter.prefab = await UIAdapter.loadPrefab('drres/prefab/Toast');
+        }
         let adapters: any = {};
-        adapters[platform] = { cpId: contentId };
-        await AdSdk.init({
-            platform: AdPlatform.Xiaomi,
-            adapters: adapters
-        });
-        AdSdk.onGameReady(this.version);
-        // AdSdk.onKeyEvent(this.onKeyEvent.bind(this));
+        adapters[platform] = { cpId: this.contentId };
+        await AdSdk.init({ platform: AdPlatform.Xiaomi, adapters: adapters });
+        AdSdk.onGameReady(UIAdapter.version);
+        if (this.canWatchVideo) {
+            AdSdk.on(AdEvent.Closed, (data: any) => {
+                if (!data.isCompleted) {
+                    PlatformAdapter.showTip("必须看完视频,才能获取奖励");
+                }
+            });
+            // 监听失败
+            AdSdk.on(AdEvent.Error, (data: any) => {
+                PlatformAdapter.showTip(`广告暂不可用，请稍后再试(${data.message})`);
+            });
+        }
+        // 预加载激励视频广告，让 native 侧提前准备，减少首次拉取失败率
+        UIAdapter.hookLoadScene();
+        UIAdapter.back.setFallback(() => UIAdapter.backHandler());
+    }
+
+    private static get isXiaomi() {
+        if (typeof window === 'undefined') return null;
+        return window['AppBridge'] || null;
     }
 
+    // ========================================================================
+    // Toast
+    // ========================================================================
+
+    public static showTip(text: string, dur = 1500) {
+        return UIAdapter.showTip(text, dur);
+    }
+
+    // ========================================================================
+    // 广告
+    // ========================================================================
+
     /**
      * 显示奖励视频
      * @param scene 视频场景
@@ -98,116 +94,124 @@ export class PlatformAdapter {
      * @param callback 回调函数
      * @param target 回调函数的this指向
      */
-    public static showRewardVideo(scene: EVideoScene, rewardType: string, callback: Function, target?: any) {
-        showRewardVideo(scene, rewardType, callback, target);
+    public static async showRewardVideo(scene: EVideoScene, rewardType: string, callback: Function, target?: any) {
+        let finishFired = false;
+        let fireFinish = () => {
+            if (finishFired) return;
+            finishFired = true;
+        };
+        let onSuccess = () => {
+            try {
+                PlatformAdapter.report(AnalyticsEvent.RewardVideoAd, AnalyticsAction.Exposure);
+                callback && callback.call(target);
+            } finally {
+                fireFinish();
+            }
+        };
+
+        if (PlatformAdapter.canWatchVideo) {
+            // 监听奖励（用户完整看完广告触发）
+            try {
+                const result = await AdSdk.requestAd({
+                    adType: AdType.RewardVideo,
+                    cpId: this.contentId,
+                    rewardType: rewardType || "reward",
+                    triggerScene: scene || "reward",
+                    extra: {}
+                });
+                if (result && result.isCompleted === true) {
+                    onSuccess();
+                    return true;
+                }
+                onSuccess();
+                return false;
+            } catch (error: any) {
+                console.log("广告请求失败", error.code, error.message);
+            }
+        } else {
+            callback && callback.call(target);
+        }
     }
+
+    // ========================================================================
+    // 按钮注册
+    // ========================================================================
+
     /**
-     * 注册按钮事件,有BtnExtra组件会自动切换按钮图片
-     * @param button 按钮组件
+     * 注册按钮事件，有 BtnExtra 组件会自动切换按钮图片
+     * @param button 按钮节点
      */
     public static registerButton(button: cc.Node) {
         var sprite = button.getComponent(cc.Sprite);
         var btnExtra = button.getComponent(BtnExtra);
-        var onFocus = () => {
-            sprite.spriteFrame = btnExtra.hoverSprite;
-        };
-        var onRomove = () => {
-            sprite.spriteFrame = btnExtra.normalSprite;
-        };
-        TvUi.focus.register(button, {
-            onFocus: onFocus,
-            onBlur: onRomove,
-        });
+        var onFocus = () => { sprite.spriteFrame = btnExtra.hoverSprite; };
+        var onRomove = () => { sprite.spriteFrame = btnExtra.normalSprite; };
+        UIAdapter.focus.register(button, { onFocus: onFocus, onBlur: onRomove });
     }
 
     /**
-     * 注册按钮事件,有BtnExtra组件会自动切换按钮图片
+     * 按名称注册按钮
      * @param name 按钮名称
-     * @param parent 查找的父节点，如果没有指定父节点，默认查找场景节点
-     * @returns 
+     * @param parent 查找的父节点，默认场景节点
      */
     public static registerButtonByName(name: string, parent: cc.Node = null) {
         if (!parent) parent = cc.director.getScene();
-        let button = this.findChildByName(parent, name);
-
-        this.registerButton(button);
+        let button = PlatformAdapter.findChildByName(parent, name);
+        PlatformAdapter.registerButton(button);
     }
 
     /**
-     * 导航到指定的按钮
+     * 导航到指定名称的按钮
      * @param name 按钮名称
-     * @param parent 查找的父节点，如果没有指定父节点，默认查找场景节点
-     * @returns 
+     * @param parent 查找的父节点，默认场景节点
      */
     public static focusButtonByName(name: string, parent: cc.Node = null) {
         if (!parent) parent = cc.director.getScene();
-        let button = this.findChildByName(parent, name);
-        TvUi.focus.focus(button);
+        let button = PlatformAdapter.findChildByName(parent, name);
+        UIAdapter.focus.focus(button);
     }
 
+    /** 导航到指定按钮 */
     public static focusButton(btn: cc.Node) {
-        TvUi.focus.focus(btn);
+        UIAdapter.focus.focus(btn);
     }
 
     /**
-     * 查找指定名称的子节点
-     * @param parent 查找的父节点
+     * 递归查找指定名称的子节点
+     * @param parent 父节点
      * @param name 子节点名称
-     * @param name 子节点名称
-     * @returns 
      */
     public static findChildByName(parent: cc.Node, name: string): cc.Node | null {
-        if (parent.name === name) {
-            return parent;
-        }
-
+        if (parent.name === name) return parent;
         for (let i = 0; i < parent.children.length; i++) {
-            let result = this.findChildByName(parent.children[i], name);
-            if (result) {
-                return result;
-            }
+            let result = PlatformAdapter.findChildByName(parent.children[i], name);
+            if (result) return result;
         }
         return null;
     }
 
+    // ========================================================================
+    // 场景 / 窗口 栈
+    // ========================================================================
 
-    /** 打开界面注册导航按钮 */
-    public static showWindow(window: cc.Node) {
-        TvUi.focus.pushScope(window.uuid, window);
-        TvUi.focus.registerButtons(window);
-        this.findBtnExtra(window);
-    }
-
-    /** 关闭界面取消注册按钮事件 */
-    public static hideWindow(window: cc.Node) {
-        TvUi.focus.unregisterByRoot(window);
-        TvUi.focus.popScope(window.uuid);
-    }
-
-    /** 刷新界面按钮事件, 用于界面按钮变化(列表，下拉)后,需要刷新按钮事件 */
-    public static refreshWindow(window: cc.Node) {
-        TvUi.focus.registerButtons(window);
-        this.findBtnExtra(window);
-    }
-
-    public static async showExitWin() {
-        let exitPfb = await Loader.loadRes('drres/prefab/ExitWin', cc.Prefab);
-        let exitWin = cc.instantiate(exitPfb);
-        exitWin.parent = cc.director.getScene();
-        exitWin.setPosition(cc.v2(cc.winSize.width / 2, cc.winSize.height / 2));
-    }
+    /** 显示预制体场景（压入场景栈，返回键可回溯）
+     * @param onBack 自定义返回处理，返回 false 表示不关闭，保留当前场景
+     */
+    public static showScene(scene: cc.Node, onBack?: () => boolean | void) { UIAdapter.showScene(scene, onBack); }
+    /** 关闭预制体场景（从栈中移除，不销毁） */
+    public static hideScene(scene: cc.Node) { UIAdapter.hideScene(scene); }
+    /** 打开界面
+     * @param onBack 自定义返回处理，返回 false 表示不关闭，保留当前窗口
+     */
+    public static showWindow(window: cc.Node, onBack?: () => boolean | void) { UIAdapter.showWindow(window, onBack); }
+    /** 关闭界面 */
+    public static hideWindow(window: cc.Node) { UIAdapter.hideWindow(window); }
+    /** 刷新导航按钮 */
+    public static refreshFocus(window: cc.Node) { UIAdapter.refreshFocus(window); }
 
-    private static findBtnExtra(node: cc.Node) {
-        for (let i = 0; i < node.children.length; i++) {
-            var child = node.children[i];
-            if (child.isValid === false || !child.activeInHierarchy) continue;
-            let btnExtra = child.getComponent(BtnExtra);
-            if (btnExtra) {
-                this.registerButton(child);
-            }
-            this.findBtnExtra(child);
-        }
-    }
+    // ========================================================================
+    // 进度 / 加载
+    // ========================================================================
 
     /** 设置启动页进度条 */
     public static setProgress(progress: number, tip: string) {
@@ -219,59 +223,41 @@ export class PlatformAdapter {
         if (window["closeLoading"]) window["closeLoading"]();
     }
 
+    // ========================================================================
+    // 上报
+    // ========================================================================
+
     /**
-     * 上报事件(缓存)
+     * 上报事件（缓存）
      * @param event 事件类型
-     * @param action 事件操作 曝光or点击 默认点击
+     * @param action 操作类型，默认点击
      * @param adRequestId 广告请求ID
      */
     public static report(event: AnalyticsEvent, action: AnalyticsAction = AnalyticsAction.Click, adRequestId?: string) {
         GameAnalytics.report(event, action, adRequestId);
     }
 
-    /**
-     * 批量上报事件(不缓存，只在仅需要曝光多个时用，点击不会同时操作多个可忽略)
-     * @param events 事件类型数组
-     */
+    /** 批量上报事件 */
     public static reportBatch(events: AnalyticsEvent[]) {
         GameAnalytics.reportBatch(events);
     }
 
-    public static get isCocos() {
-        return window['cc'] != undefined;
-    }
-
-    /** 是否是基座环境 */
-    public static get isWebBridge() {
-        return this.webBridge.isAvailable();
-    }
+    // ========================================================================
+    // 属性
+    // ========================================================================
 
+    /** 是否 Cocos 环境 */
+    public static get isCocos() { return window['cc'] != undefined; }
+    /** 是否基座环境 */
+    public static get isWebBridge() { return UIAdapter.webBridge.isAvailable(); }
     /** 是否可以观看视频 */
-    public static get canWatchVideo() {
-        return !this._canWatchVideo;
-    }
-
-    /** 是否是VIP用户 */
-    public static get isVIP() {
-        return this._isVIP;
-    }
-
-    /** 退出游戏 */
-    public static exitGame() {
-        if (this.isWebBridge) {
-            this.webBridge.callHandler("router/navigateBack", {}, (a) => { cc.log(a); });
-            return;
-        }
-        if (AdSdk.exitGame) AdSdk.exitGame();
-        cc.game.end();
-    }
+    public static get canWatchVideo() { return this.isXiaomi; }
+    /** 是否 VIP 用户 */
+    public static get isVIP() { return UIAdapter._isVIP; }
 
-    /** 显示帮助窗口 
-     * @param url 帮助窗口的url
-     * @param cb 回调函数,当帮助窗口关闭后会调用该回调函数
-    */
+    /** 显示帮助窗口 */
     public static async showHelperWin(url: string, cb: () => void) {
-        var key = `${this._zhName}-isFirst`;
+        var key = `${UIAdapter._zhName}-isFirst`;
         var isFirst = cc.sys.localStorage.getItem(key);
         if (!isFirst) {
             cc.sys.localStorage.setItem(key, false);

package/drscript/PlatformAdapter.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "827ee68b-a1d6-474c-b8b6-5f4f4db7f9e8",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}