@chiyou/minigame-framework 1.3.0 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chiyou/minigame-framework",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "基于 Cocos Creator 3.x 的小游戏开发框架，支持多平台发布",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/Framework/Adapter/PlatformAdapter/PlatformAdapterBilibili.ts

@@ -265,12 +265,38 @@ export class PlatformAdapterBilibili extends AbsPlatformAdapter {
     }
 
     public getScreenInfo(): ScreenInfo {
-        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0);
+        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0, {
+            left: 0, right: 0, top: 0,bottom: 0,
+            width: 0, height: 0
+        });
 
         if (window["bl"] && window["bl"].getSystemInfoSync) {
             let systemInfo: any = window["bl"].getSystemInfoSync();
             if (systemInfo !== null) {
-                screenInfo = new ScreenInfo(screenInfo.windowWidth, screenInfo.windowHeight, systemInfo.screenWidth, systemInfo.screenHeight);
+                screenInfo.screenWidth = systemInfo.screenWidth;
+                screenInfo.screenHeight = systemInfo.screenHeight;
+                screenInfo.windowWidth = systemInfo.windowWidth;
+                screenInfo.windowHeight = systemInfo.windowHeight;
+
+                if (systemInfo.safeArea !== null) {
+                    screenInfo.safeArea = {
+                        left: systemInfo.safeArea.left,
+                        right: systemInfo.safeArea.right,
+                        top: systemInfo.safeArea.top,
+                        bottom: systemInfo.safeArea.bottom,
+                        width: systemInfo.safeArea.width,
+                        height: systemInfo.safeArea.height,
+                    }
+                } else {
+                    screenInfo.safeArea = {
+                        left: 0,
+                        right: systemInfo.screenWidth,
+                        top: 0,
+                        bottom: systemInfo.screenHeight,
+                        width: systemInfo.screenWidth,
+                        height: systemInfo.screenHeight,
+                    }
+                }
             }
         }
 

package/src/Framework/Adapter/PlatformAdapter/PlatformAdapterDesktopBrowser.ts

@@ -113,7 +113,14 @@ export class PlatformAdapterDesktopBrowser extends AbsPlatformAdapter {
     }
 
     public getScreenInfo(): ScreenInfo {
-        let screenInfo: ScreenInfo = new ScreenInfo(screen.width, screen.height, screen.width, screen.height);
+        let screenWidth = screen.width;
+        let screenHeight = screen.height;
+
+        let screenInfo: ScreenInfo = new ScreenInfo(
+            screenWidth, screenHeight, screenWidth, screenHeight, {
+            left: 0, right: screenWidth, top: 0,bottom: screenHeight,
+            width: screenWidth, height: screenHeight
+        });
 
         LogUtils.Instance.info(PlatformAdapterDesktopBrowser.TAG, "获取屏幕信息", {
             operation: "getScreenInfo",

package/src/Framework/Adapter/PlatformAdapter/PlatformAdapterDouYin.ts

@@ -281,12 +281,38 @@ export class PlatformAdapterDouYin extends AbsPlatformAdapter {
     }
 
     public getScreenInfo(): ScreenInfo {
-        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0);
+        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0, {
+            left: 0, right: 0, top: 0,bottom: 0,
+            width: 0, height: 0
+        });
 
         if (window["tt"] && window["tt"].getSystemInfoSync) {
             let systemInfo: any = window["tt"].getSystemInfoSync();
             if (systemInfo !== null) {
-                screenInfo = new ScreenInfo(systemInfo.windowWidth, systemInfo.windowHeight, systemInfo.screenWidth, systemInfo.screenHeight);
+                screenInfo.screenWidth = systemInfo.screenWidth;
+                screenInfo.screenHeight = systemInfo.screenHeight;
+                screenInfo.windowWidth = systemInfo.windowWidth;
+                screenInfo.windowHeight = systemInfo.windowHeight;
+
+                if (systemInfo.safeArea !== null) {
+                    screenInfo.safeArea = {
+                        left: systemInfo.safeArea.left,
+                        right: systemInfo.safeArea.right,
+                        top: systemInfo.safeArea.top,
+                        bottom: systemInfo.safeArea.bottom,
+                        width: systemInfo.safeArea.width,
+                        height: systemInfo.safeArea.height,
+                    }
+                } else {
+                    screenInfo.safeArea = {
+                        left: 0,
+                        right: systemInfo.screenWidth,
+                        top: 0,
+                        bottom: systemInfo.screenHeight,
+                        width: systemInfo.screenWidth,
+                        height: systemInfo.screenHeight,
+                    }
+                }
             }
         }
 

package/src/Framework/Adapter/PlatformAdapter/PlatformAdapterHonor.ts

@@ -187,12 +187,38 @@ export class PlatformAdapterHonor extends AbsPlatformAdapter {
     }
 
     public getScreenInfo(): ScreenInfo {
-        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0);
+        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0, {
+            left: 0, right: 0, top: 0,bottom: 0,
+            width: 0, height: 0
+        });
 
-        if (window["qg"] && window["qg"].getWindowInfo) {
-            let windowInfo: any = window["qg"].getWindowInfo();
-            if (windowInfo !== null) {
-                screenInfo = new ScreenInfo(windowInfo.windowWidth, windowInfo.windowHeight, windowInfo.screenWidth, windowInfo.screenHeight);
+        if (window["qg"] && window["qg"].getSystemInfoSync) {
+            let systemInfo: any = window["qg"].getSystemInfoSync();
+            if (systemInfo !== null) {
+                screenInfo.screenWidth = systemInfo.screenWidth;
+                screenInfo.screenHeight = systemInfo.screenHeight;
+                screenInfo.windowWidth = systemInfo.windowWidth;
+                screenInfo.windowHeight = systemInfo.windowHeight;
+
+                if (systemInfo.safeArea !== null) {
+                    screenInfo.safeArea = {
+                        left: systemInfo.safeArea.left,
+                        right: systemInfo.safeArea.right,
+                        top: systemInfo.safeArea.top,
+                        bottom: systemInfo.safeArea.bottom,
+                        width: systemInfo.safeArea.width,
+                        height: systemInfo.safeArea.height,
+                    }
+                } else {
+                    screenInfo.safeArea = {
+                        left: 0,
+                        right: systemInfo.screenWidth,
+                        top: 0,
+                        bottom: systemInfo.screenHeight,
+                        width: systemInfo.screenWidth,
+                        height: systemInfo.screenHeight,
+                    }
+                }
             }
         }
         

package/src/Framework/Adapter/PlatformAdapter/PlatformAdapterHuaWei.ts

@@ -184,7 +184,40 @@ export class PlatformAdapterHuaWei extends AbsPlatformAdapter {
     }
 
     public getScreenInfo(): ScreenInfo {
-        let screenInfo: ScreenInfo = new ScreenInfo(screen.availWidth, screen.availHeight, screen.width, screen.height);
+        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0, {
+            left: 0, right: 0, top: 0,bottom: 0,
+            width: 0, height: 0
+        });
+
+        if (window["qg"] && window["qg"].getSystemInfoSync) {
+            let systemInfo: any = window["qg"].getSystemInfoSync();
+            if (systemInfo !== null) {
+                screenInfo.screenWidth = systemInfo.screenWidth;
+                screenInfo.screenHeight = systemInfo.screenHeight;
+                screenInfo.windowWidth = systemInfo.windowWidth;
+                screenInfo.windowHeight = systemInfo.windowHeight;
+
+                if (systemInfo.safeArea !== null) {
+                    screenInfo.safeArea = {
+                        left: systemInfo.safeArea.left,
+                        right: systemInfo.safeArea.right,
+                        top: systemInfo.safeArea.top,
+                        bottom: systemInfo.safeArea.bottom,
+                        width: systemInfo.safeArea.width,
+                        height: systemInfo.safeArea.height,
+                    }
+                } else {
+                    screenInfo.safeArea = {
+                        left: 0,
+                        right: systemInfo.screenWidth,
+                        top: 0,
+                        bottom: systemInfo.screenHeight,
+                        width: systemInfo.screenWidth,
+                        height: systemInfo.screenHeight,
+                    }
+                }
+            }
+        }
 
         LogUtils.Instance.info(PlatformAdapterHuaWei.TAG, "获取屏幕信息", {
             operation: "getScreenInfo",

package/src/Framework/Adapter/PlatformAdapter/PlatformAdapterKuaiShou.ts

@@ -222,12 +222,38 @@ export class PlatformAdapterKuaiShou extends AbsPlatformAdapter {
     }
 
     public getScreenInfo(): ScreenInfo {
-        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0);
+        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0, {
+            left: 0, right: 0, top: 0,bottom: 0,
+            width: 0, height: 0
+        });
 
         if (window["ks"] && window["ks"].getSystemInfoSync) {
             let systemInfo: any = window["ks"].getSystemInfoSync();
             if (systemInfo !== null) {
-                screenInfo = new ScreenInfo(systemInfo.windowWidth, systemInfo.windowHeight, systemInfo.screenWidth, systemInfo.screenHeight);
+                screenInfo.screenWidth = systemInfo.screenWidth;
+                screenInfo.screenHeight = systemInfo.screenHeight;
+                screenInfo.windowWidth = systemInfo.windowWidth;
+                screenInfo.windowHeight = systemInfo.windowHeight;
+
+                if (systemInfo.safeArea !== null) {
+                    screenInfo.safeArea = {
+                        left: systemInfo.safeArea.left,
+                        right: systemInfo.safeArea.right,
+                        top: systemInfo.safeArea.top,
+                        bottom: systemInfo.safeArea.bottom,
+                        width: systemInfo.safeArea.width,
+                        height: systemInfo.safeArea.height,
+                    }
+                } else {
+                    screenInfo.safeArea = {
+                        left: 0,
+                        right: systemInfo.screenWidth,
+                        top: 0,
+                        bottom: systemInfo.screenHeight,
+                        width: systemInfo.screenWidth,
+                        height: systemInfo.screenHeight,
+                    }
+                }
             }
         }
 

package/src/Framework/Adapter/PlatformAdapter/PlatformAdapterOppo.ts

@@ -187,12 +187,27 @@ export class PlatformAdapterOppo extends AbsPlatformAdapter {
     }
 
     public getScreenInfo(): ScreenInfo {
-        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0);
+        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0, {
+            left: 0, right: 0, top: 0,bottom: 0,
+            width: 0, height: 0
+        });
 
         if (window["qg"] && window["qg"].getSystemInfoSync) {
             let systemInfo: any = window["qg"].getSystemInfoSync();
             if (systemInfo !== null) {
-                screenInfo = new ScreenInfo(systemInfo.windowWidth, systemInfo.windowHeight, systemInfo.screenWidth, systemInfo.screenHeight);
+                screenInfo.screenWidth = systemInfo.screenWidth;
+                screenInfo.screenHeight = systemInfo.screenHeight;
+                screenInfo.windowWidth = systemInfo.windowWidth;
+                screenInfo.windowHeight = systemInfo.windowHeight;
+
+                screenInfo.safeArea = {
+                    left: 0,
+                    right: systemInfo.screenWidth,
+                    top: 0,
+                    bottom: systemInfo.screenHeight,
+                    width: systemInfo.screenWidth,
+                    height: systemInfo.screenHeight,
+                }
             }
         }
 

package/src/Framework/Adapter/PlatformAdapter/PlatformAdapterTapTap.ts

@@ -202,12 +202,38 @@ export class PlatformAdapterTapTap extends AbsPlatformAdapter {
     }
 
     public getScreenInfo(): ScreenInfo {
-        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0);
+        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0, {
+            left: 0, right: 0, top: 0,bottom: 0,
+            width: 0, height: 0
+        });
 
-        if (window["tap"] && window["tap"].getSystemInfoSync) {
-            let systemInfo: any = window["tap"].getSystemInfoSync();
-            if (systemInfo !== null) {
-                screenInfo = new ScreenInfo(systemInfo.windowWidth, systemInfo.windowHeight, systemInfo.screenWidth, systemInfo.screenHeight);
+        if (window["tap"] && window["tap"].getWindowInfo) {
+            let windowInfo: any = window["tap"].getWindowInfo();
+            if (windowInfo !== null) {
+                screenInfo.screenWidth = windowInfo.screenWidth;
+                screenInfo.screenHeight = windowInfo.screenHeight;
+                screenInfo.windowWidth = windowInfo.windowWidth;
+                screenInfo.windowHeight = windowInfo.windowHeight;
+
+                if (windowInfo.safeArea !== null) {
+                    screenInfo.safeArea = {
+                        left: windowInfo.safeArea.left,
+                        right: windowInfo.safeArea.right,
+                        top: windowInfo.safeArea.top,
+                        bottom: windowInfo.safeArea.bottom,
+                        width: windowInfo.safeArea.width,
+                        height: windowInfo.safeArea.height,
+                    }
+                } else {
+                    screenInfo.safeArea = {
+                        left: 0,
+                        right: windowInfo.screenWidth,
+                        top: 0,
+                        bottom: windowInfo.screenHeight,
+                        width: windowInfo.screenWidth,
+                        height: windowInfo.screenHeight,
+                    }
+                }
             }
         }
 

package/src/Framework/Adapter/PlatformAdapter/PlatformAdapterVivo.ts

@@ -175,12 +175,40 @@ export class PlatformAdapterVivo extends AbsPlatformAdapter {
     }
 
     public getScreenInfo(): ScreenInfo {
-        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0);
+        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0, {
+            left: 0, right: 0, top: 0,bottom: 0,
+            width: 0, height: 0
+        });
 
-        if (window["qg"] && window["qg"].getWindowInfo) {
+        if (window["qg"] && window["qg"].getWindowInfo && window["qg"].getSystemInfoSync) {
+            let systemInfo: any = window["qg"].getSystemInfoSync();
             let windowInfo: any = window["qg"].getWindowInfo();
-            if (windowInfo !== null) {
-                screenInfo = new ScreenInfo(windowInfo.windowWidth, windowInfo.windowHeight, windowInfo.windowWidth, windowInfo.windowHeight);
+
+            if (windowInfo !== null && systemInfo !== null) {
+                screenInfo.screenWidth = systemInfo.screenWidth;
+                screenInfo.screenHeight = systemInfo.screenHeight;
+                screenInfo.windowWidth = windowInfo.windowWidth;
+                screenInfo.windowHeight = windowInfo.windowHeight;
+
+                if (windowInfo.safeArea !== null) {
+                    screenInfo.safeArea = {
+                        left: windowInfo.safeArea.left,
+                        right: windowInfo.safeArea.right,
+                        top: windowInfo.safeArea.top,
+                        bottom: windowInfo.safeArea.bottom,
+                        width: windowInfo.safeArea.width,
+                        height: windowInfo.safeArea.height,
+                    }
+                } else {
+                    screenInfo.safeArea = {
+                        left: 0,
+                        right: systemInfo.screenWidth,
+                        top: 0,
+                        bottom: systemInfo.screenHeight,
+                        width: systemInfo.screenWidth,
+                        height: systemInfo.screenHeight,
+                    }
+                }
             }
         }
 

package/src/Framework/Adapter/PlatformAdapter/PlatformAdapterWeiXin.ts

@@ -342,12 +342,38 @@ export class PlatformAdapterWeiXin extends AbsPlatformAdapter {
     }
 
     public getScreenInfo(): ScreenInfo {
-        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0);
+        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0, {
+            left: 0, right: 0, top: 0,bottom: 0,
+            width: 0, height: 0
+        });
 
         if (window["wx"] && window["wx"].getWindowInfo) {
             let windowInfo: any = window["wx"].getWindowInfo();
             if (windowInfo !== null) {
-                screenInfo = new ScreenInfo(windowInfo.windowWidth, windowInfo.windowHeight, windowInfo.screenWidth, windowInfo.screenHeight);
+                screenInfo.screenWidth = windowInfo.screenWidth;
+                screenInfo.screenHeight = windowInfo.screenHeight;
+                screenInfo.windowWidth = windowInfo.windowWidth;
+                screenInfo.windowHeight = windowInfo.windowHeight;
+
+                if (windowInfo.safeArea !== null) {
+                    screenInfo.safeArea = {
+                        left: windowInfo.safeArea.left,
+                        right: windowInfo.safeArea.right,
+                        top: windowInfo.safeArea.top,
+                        bottom: windowInfo.safeArea.bottom,
+                        width: windowInfo.safeArea.width,
+                        height: windowInfo.safeArea.height,
+                    }
+                } else {
+                    screenInfo.safeArea = {
+                        left: 0,
+                        right: windowInfo.screenWidth,
+                        top: 0,
+                        bottom: windowInfo.screenHeight,
+                        width: windowInfo.screenWidth,
+                        height: windowInfo.screenHeight,
+                    }
+                }
             }
         }
 

package/src/Framework/Adapter/PlatformAdapter/PlatformAdapterXiaoMi.ts

@@ -182,12 +182,38 @@ export class PlatformAdapterXiaoMi extends AbsPlatformAdapter {
     }
 
     public getScreenInfo(): ScreenInfo {
-        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0);
+        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0, {
+            left: 0, right: 0, top: 0,bottom: 0,
+            width: 0, height: 0
+        });
 
-        if (window["qg"] && window["qg"].getWindowInfo) {
-            let windowInfo: any = window["qg"].getWindowInfo();
-            if (windowInfo !== null) {
-                screenInfo = new ScreenInfo(windowInfo.windowWidth, windowInfo.windowHeight, windowInfo.windowWidth, windowInfo.windowHeight);
+        if (window["qg"] && window["qg"].getSystemInfoSync) {
+            let systemInfo: any = window["qg"].getSystemInfoSync();
+            if (systemInfo !== null) {
+                screenInfo.screenWidth = systemInfo.screenWidth;
+                screenInfo.screenHeight = systemInfo.screenHeight;
+                screenInfo.windowWidth = systemInfo.windowWidth;
+                screenInfo.windowHeight = systemInfo.windowHeight;
+
+                if (systemInfo.safeArea !== null) {
+                    screenInfo.safeArea = {
+                        left: systemInfo.safeArea.left,
+                        right: systemInfo.safeArea.right,
+                        top: systemInfo.safeArea.top,
+                        bottom: systemInfo.safeArea.bottom,
+                        width: systemInfo.safeArea.width,
+                        height: systemInfo.safeArea.height,
+                    }
+                } else {
+                    screenInfo.safeArea = {
+                        left: 0,
+                        right: systemInfo.screenWidth,
+                        top: 0,
+                        bottom: systemInfo.screenHeight,
+                        width: systemInfo.screenWidth,
+                        height: systemInfo.screenHeight,
+                    }
+                }
             }
         }
 

package/src/Framework/Adapter/PlatformAdapter/PlatformAdapterZhiFuBao.ts

@@ -179,12 +179,38 @@ export class PlatformAdapterZhiFuBao extends AbsPlatformAdapter {
     }
 
     public getScreenInfo(): ScreenInfo {
-        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0);
+        let screenInfo: ScreenInfo = new ScreenInfo(0, 0, 0, 0, {
+            left: 0, right: 0, top: 0,bottom: 0,
+            width: 0, height: 0
+        });
 
-        if (window["my"] && window["my"].getSystemInfoSync) {
-            let systemInfo: any = window["my"].getSystemInfoSync();
-            if (systemInfo !== null) {
-                screenInfo = new ScreenInfo(systemInfo.windowWidth, systemInfo.windowHeight, systemInfo.screenWidth, systemInfo.screenHeight);
+        if (window["my"] && window["my"].getWindowInfo) {
+            let windowInfo: any = window["my"].getWindowInfo();
+            if (windowInfo !== null) {
+                screenInfo.screenWidth = windowInfo.screenWidth;
+                screenInfo.screenHeight = windowInfo.screenHeight;
+                screenInfo.windowWidth = windowInfo.windowWidth;
+                screenInfo.windowHeight = windowInfo.windowHeight;
+
+                if (windowInfo.safeArea !== null) {
+                    screenInfo.safeArea = {
+                        left: windowInfo.safeArea.left,
+                        right: windowInfo.safeArea.right,
+                        top: windowInfo.safeArea.top,
+                        bottom: windowInfo.safeArea.bottom,
+                        width: windowInfo.safeArea.width,
+                        height: windowInfo.safeArea.height,
+                    }
+                } else {
+                    screenInfo.safeArea = {
+                        left: 0,
+                        right: windowInfo.screenWidth,
+                        top: 0,
+                        bottom: windowInfo.screenHeight,
+                        width: windowInfo.screenWidth,
+                        height: windowInfo.screenHeight,
+                    }
+                }
             }
         }
 

package/src/Framework/Definition/AnalyticsDefinition.ts

@@ -0,0 +1,107 @@
+/**
+ * AnalyticsDefinition.ts
+ * 统计分析模块类型定义
+ */
+
+import { PlatformID } from "./SystemDefinition";
+
+// ==================== 基础类型 ====================
+
+/** 事件参数类型 */
+export type EventParams = Record<string, string | number | boolean> | string;
+
+// ==================== 配置接口 ====================
+
+/** 友盟 SDK 配置 */
+export interface UmengConfig {
+    /** 各平台 appKey 映射（必填） */
+    appKeyMap: Map<PlatformID, string>;
+    /** 是否使用 openid 进行统计 @default false */
+    useOpenid?: boolean;
+    /** 是否自动获取 openid @default false */
+    autoGetOpenid?: boolean;
+    /** 是否开启调试模式 @default false */
+    debug?: boolean;
+}
+
+/** 统计分析总配置 */
+export interface AnalyticsConfig {
+    /** 是否启用统计功能 */
+    enable: boolean;
+    /** 友盟配置 */
+    umeng?: UmengConfig;
+}
+
+// ==================== 用户相关 ====================
+
+/** 用户属性 */
+export interface UserProperties {
+    userId?: string;
+    provider?: string;
+    nickName?: string;
+    avatarUrl?: string;
+    gender?: number;
+    country?: string;
+    province?: string;
+    city?: string;
+    [key: string]: any;
+}
+
+// ==================== 友盟 SDK 接口 ====================
+
+/** 友盟 SDK 实例方法 */
+export interface UmengSDK {
+    init(config: UmengConfig): void;
+    resume(options?: any): void;
+    pause(): void;
+    trackEvent(eventName: string, params?: object | string): void;
+    trackShare(shareOptions: object): object;
+    trackPageStart(pageName: string): void;
+    trackPageEnd(pageName: string): void;
+    setOpenid(openid: string): void;
+    setUnionid(unionid: string): void;
+    setUserid(userid: string, provider?: string): void;
+    removeUserid(): void;
+    setUserInfo(userInfo: object): void;
+    setAnonymousid(anonymousid: string): void;
+    setAppVersion(version: string): void;
+    setSuperProperty(property: string): void;
+    onShareAppMessage(callback: () => object): void;
+    shareAppMessage(options: object): void;
+}
+
+// ==================== 预定义事件 ID ====================
+
+/** 预定义事件 ID */
+export enum AnalyticsEventId {
+    LevelStart = 'level_start',
+    LevelComplete = 'level_complete',
+    LevelFail = 'level_fail',
+    AdShow = 'ad_show',
+    AdClick = 'ad_click',
+    AdComplete = 'ad_complete',
+    AdSkip = 'ad_skip',
+    AdError = 'ad_error',
+    Purchase = 'purchase',
+    Share = 'share',
+    Login = 'login',
+    GameLaunch = 'game_launch',
+    GameError = 'game_error',
+}
+
+/** 事件参数键名 */
+export enum AnalyticsParamKey {
+    Level = 'level',
+    Score = 'score',
+    Duration = 'duration',
+    Reason = 'reason',
+    AdType = 'ad_type',
+    AdId = 'ad_id',
+    ItemId = 'item_id',
+    ItemName = 'item_name',
+    Price = 'price',
+    Currency = 'currency',
+    ShareType = 'share_type',
+    ErrorCode = 'error_code',
+    ErrorMsg = 'error_msg',
+}

package/src/Framework/Definition/FwkErrorDefinition.ts

@@ -110,7 +110,16 @@ export namespace FwkErrorCode {
         export const ComponentNotFound = 13001; // 13001 - 节点缺少必要组件
     }
     
-    // 14-50预留给Mgr使用
+    // 统计分析模块错误码（14xxx）
+    export namespace Analytics {
+        export const NotInit = 14001;           // 14001 - 统计模块未初始化
+        export const ConfigError = 14002;       // 14002 - 统计配置错误
+        export const SDKInitFailed = 14003;     // 14003 - SDK初始化失败
+        export const SDKCallFailed = 14004;     // 14004 - SDK接口调用失败
+        export const PlatformNotSupported = 14005; // 14005 - 平台不支持统计
+    }
+    
+    // 15-50预留给Mgr使用
     
     // DesktopBrowser平台错误码
     export namespace DesktopBrowser_Pt {
@@ -329,7 +338,14 @@ export const ErrorDescription: Record<number, string> = {
     // 输入模块（13xxx）
     [FwkErrorCode.Input.ComponentNotFound]: "节点缺少必要组件",
     
-    // 14-50预留给Mgr使用
+    // 统计分析模块（14xxx）
+    [FwkErrorCode.Analytics.NotInit]: "统计模块未初始化",
+    [FwkErrorCode.Analytics.ConfigError]: "统计配置错误",
+    [FwkErrorCode.Analytics.SDKInitFailed]: "SDK初始化失败",
+    [FwkErrorCode.Analytics.SDKCallFailed]: "SDK接口调用失败",
+    [FwkErrorCode.Analytics.PlatformNotSupported]: "平台不支持统计",
+    
+    // 15-50预留给Mgr使用
     
     // DesktopBrowser平台
     // 51xxx: DesktopBrowser_Pt

package/src/Framework/Definition/SystemDefinition.ts

@@ -25,17 +25,28 @@ export type AppItem = {
     appIDMap: Map<PlatformID, string>;
 }
 
+export interface ISafeArea {
+    left: number; // 安全区左边界 X
+    right: number; // 安全区右边界 X
+    top: number; // 安全区上边界 Y（刘海高度）
+    bottom: number; // 安全区下边界 Y
+    width: number; // 安全区宽度，单位逻辑像素
+    height: number; // 安全区高度，单位逻辑像素
+}
+
 export class ScreenInfo {
     windowWidth: number;
     windowHeight: number;
     screenWidth: number;
     screenHeight: number;
+    safeArea: ISafeArea;
 
-    constructor(windowWidth: number, windowHeight: number, screenWidth: number, screenHeight: number) {
+    constructor(windowWidth: number, windowHeight: number, screenWidth: number, screenHeight: number, safeArea: ISafeArea) {
         this.windowWidth = windowWidth;
         this.windowHeight = windowHeight;
         this.screenWidth = screenWidth;
         this.screenHeight = screenHeight;
+        this.safeArea = safeArea;
     }
 }