drgame-cc 1.0.37 → 1.0.38

package/drscript/PlatformAdapter.ts

@@ -7,16 +7,19 @@ import { showRewardVideo } from "./Info";
 import { Loader } from "./Loader";
 import ToastManager from "./toast/ToastManager";
 import { InternalUitl } from "./InternalUitl";
+import { WebBridge } from "./WebBridge";
 /** 平台适配器,名字有点长防止和Platform，Adapter冲突 */
 export class PlatformAdapter {
     private static readonly version = "1.0.36";
     private static readonly designWidth = 1920;
     private static readonly designHeight = 1080;
+    private static webBridge: WebBridge;
     /** 初始化
      * @param cnName 中文名称
      * @param minigameID 小游戏ID,文档地址:https://doc.weixin.qq.com/sheet/e3_AcEAlgaLALsCNiuHzH2NOQGCjVc3a?scode=AOcA0AdfAAoSqmh5BfAQIA6AYEAB4&tab=BB08J2
      */
     public static async init(cnName: string, minigameID: number) {
+        this.webBridge = new WebBridge();
         var platform = GameAnalyticsPlatform.XiaomiTv;//平台由sdk后续处理
         var appItem = GameAnalytics.getAppItem(platform);
         var contentId = minigameID.toString();//InternalUitl.getChineseInitials(cnName);
@@ -226,7 +229,12 @@ export class PlatformAdapter {
 
     /** 退出游戏 */
     public static exitGame() {
-        let bridge: ILobbyBridge = cc.director.getScene().getComponentInChildren('LobbyBridge');
+        if (this.webBridge.isAvailable()) {
+            this.webBridge.callHandler("router/navigateBack", {}, (a) => { cc.log(a); });
+            return;
+        }
+        var GRoot = window['GRoot'];
+        let bridge: ILobbyBridge = GRoot && GRoot.inst.node.getComponentInChildren('LobbyBridge');
         bridge && bridge.exitGame();
     }
 }

package/drscript/WebBridge.ts

@@ -0,0 +1,35 @@
+/**
+ * Web 桥接
+ * 封装 window.callHandler 的调用逻辑
+ * 构造时一次性检测可用性，避免每次调用重复判断
+ */
+export class WebBridge {
+
+    /** 缓存：callHandler 是否可用 */
+    private _available: boolean;
+
+    constructor() {
+        this._available = cc.sys.isBrowser && typeof (window as any).callHandler === 'function';
+    }
+
+    /** 检测浏览器环境中是否存在 callHandler */
+    isAvailable(): boolean {
+        return this._available;
+    }
+
+    callHandler(message: string, param: any, success?: Function, fail?: Function): void {
+        if (this._available) {
+            (window as any).callHandler(message, param, success);
+        } else {
+            fail && fail({ code: -1, message: 'callHandler 未找到，非基座环境' });
+        }
+    }
+
+    async getSystemInfo(): Promise<any> {
+        return new Promise<any>((resolve, reject) => {
+            this.callHandler("system/getSystemInfo", {}, resolve,
+                (err: any) => reject(err || new Error('非基座环境：callHandler 不存在'))
+            );
+        });
+    }
+}

package/drscript/input/KeyCodeAdapter.ts

@@ -11,13 +11,13 @@ export enum TvRemoteKey {
 
 export default class KeyCodeAdapter {
     public static toRemoteKey(keyCode: number): TvRemoteKey {
-        if ([0, 4, 8, 27, 10009].indexOf(keyCode) >= 0) return TvRemoteKey.Back;
-        if ([13, 23, 66].indexOf(keyCode) >= 0) return TvRemoteKey.Ok;
+        if ([0, 4, 6, 8, 27, 10009].indexOf(keyCode) >= 0) return TvRemoteKey.Back;
+        if ([13, 23, 66, 1005].indexOf(keyCode) >= 0) return TvRemoteKey.Ok;
         if ([80].indexOf(keyCode) >= 0) return TvRemoteKey.Pause;
-        if ([21, 37].indexOf(keyCode) >= 0) return TvRemoteKey.Left;
-        if ([19, 38].indexOf(keyCode) >= 0) return TvRemoteKey.Up;
-        if ([22, 39].indexOf(keyCode) >= 0) return TvRemoteKey.Right;
-        if ([20, 40].indexOf(keyCode) >= 0) return TvRemoteKey.Down;
+        if ([21, 37, 1000].indexOf(keyCode) >= 0) return TvRemoteKey.Left;
+        if ([19, 38, 1003].indexOf(keyCode) >= 0) return TvRemoteKey.Up;
+        if ([22, 39, 1001].indexOf(keyCode) >= 0) return TvRemoteKey.Right;
+        if ([20, 40, 1004].indexOf(keyCode) >= 0) return TvRemoteKey.Down;
         return TvRemoteKey.Unknown;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drgame-cc",
-  "version": "1.0.37",
+  "version": "1.0.38",
   "description": "道然游戏适配包",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",