@chiyou/minigame-framework 1.3.2 → 1.3.3

package/package.json

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

package/src/Framework/Definition/AnalyticsDefinition.ts

@@ -24,14 +24,6 @@ export interface UmengConfig {
     debug?: boolean;
 }
 
-/** 统计分析总配置 */
-export interface AnalyticsConfig {
-    /** 是否启用统计功能 */
-    enable: boolean;
-    /** 友盟配置 */
-    umeng?: UmengConfig;
-}
-
 // ==================== 用户相关 ====================
 
 /** 用户属性 */
@@ -47,29 +39,6 @@ export interface UserProperties {
     [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 */
@@ -102,6 +71,7 @@ export enum AnalyticsParamKey {
     Price = 'price',
     Currency = 'currency',
     ShareType = 'share_type',
+    ShareContent = 'share_content',
     ErrorCode = 'error_code',
     ErrorMsg = 'error_msg',
 }

package/src/Framework/Definition/FrameworkBase.ts

@@ -21,5 +21,7 @@ export class FrameworkBase {
     static readonly Message = class {
         static readonly LifeCycle_onGameHide: string = "LifeCycle_onGameHide";
         static readonly LifeCycle_onGameShow: string = "LifeCycle_onGameShow";
+
+        static readonly UserMgr_PlatformOpenId_Ready: string = "UserMgr_PlatformOpenId_Ready";
     }
 }

package/src/Framework/Definition/UserDefinition.ts

@@ -76,16 +76,4 @@ export enum UpdateUserDataResult {
     Result_NoNeed = -1,
     Result_Success = 0,
     Result_Fail = 1,
-}
-
-export enum LoginResultType {
-    Type_SessionAvailable = 0,
-    Type_LoginSuccess_Auth_Code = 1,
-    Type_LoginSuccess_Auth_AccountID = 2,
-    Type_LoginFail_ContinueGame = 3,
-    Type_LoginFail_ExitGame = 4,
-}
-
-export type LoginResult = {
-    type: LoginResultType;
 }

package/src/Framework/Manager/AnalyticsMgr.ts

@@ -5,6 +5,8 @@ import { FwkErrorCode } from "../Definition/FwkErrorDefinition";
 import { PlatformID } from "../Definition/SystemDefinition";
 import { UmengConfig, EventParams, UserProperties, AnalyticsEventId, AnalyticsParamKey } from "../Definition/AnalyticsDefinition";
 import { UmaInitConfig, UmaSDK, uma as wxUma } from "../SDK/Umeng/umtrack-wx-game";
+import { EventMgr } from "./EventMgr";
+import { FrameworkBase } from "../Definition/FrameworkBase";
 // 后续新增平台 SDK 在此导入，例如：
 // import { uma as ttUma } from "../SDK/Umeng/umtrack-tt-game";
 
@@ -53,9 +55,13 @@ export class AnalyticsMgr extends BaseMgr {
 
         // 注意：SDK 内部已注册 wx.onShow/onHide 自动调用 resume/pause
         // 无需在 AnalyticsMgr 监听生命周期事件
+
+        EventMgr.Instance.on(FrameworkBase.Message.UserMgr_PlatformOpenId_Ready, this._onPlatformOpenIdReady, this);
     }
 
     onDestroy(): void {
+        EventMgr.Instance.off(FrameworkBase.Message.UserMgr_PlatformOpenId_Ready, this._onPlatformOpenIdReady, this);
+
         super.onDestroy();
     }
 
@@ -92,8 +98,7 @@ export class AnalyticsMgr extends BaseMgr {
         if (appKey && sdk) {
             this._appKey = appKey;
             this._sdk = sdk;
-            this._isEnabled = true;
-            this._initUmeng();
+            this._isEnabled = this._initUmeng();
         } else {
             this._isEnabled = false;
             if (!sdk) {
@@ -114,6 +119,14 @@ export class AnalyticsMgr extends BaseMgr {
         });
     }
 
+    private _onPlatformOpenIdReady(platformOpenId: string): void {
+        if (!this._isEnabled) return;
+
+        if (this._umengConfig && this._umengConfig.useOpenid && !this._umengConfig.autoGetOpenid) {
+            this.setOpenId(platformOpenId);
+        }
+    }
+
     // ==================== 生命周期 ====================
     // 注意：SDK 内部已自动处理 wx.onShow/onHide 的 resume/pause 调用
 
@@ -295,7 +308,7 @@ export class AnalyticsMgr extends BaseMgr {
     public trackShare(shareType: string, shareContent?: string): void {
         const params: Record<string, any> = {
             [AnalyticsParamKey.ShareType]: shareType,
-            ...(shareContent ? { [AnalyticsParamKey.ShareType]: shareContent } : {}),
+            ...(shareContent ? { [AnalyticsParamKey.ShareContent]: shareContent } : {}),
         };
         this.trackEvent(AnalyticsEventId.Share, params);
     }
@@ -317,7 +330,7 @@ export class AnalyticsMgr extends BaseMgr {
     // ==================== 私有方法 ====================
 
     /** 初始化友盟 SDK */
-    private _initUmeng(): void {
+    private _initUmeng(): boolean {
         try {
             const sdkConfig: UmaInitConfig = {
                 appKey: this._appKey,
@@ -331,12 +344,16 @@ export class AnalyticsMgr extends BaseMgr {
                 useOpenid: sdkConfig.useOpenid,
                 debug: sdkConfig.debug,
             });
+
+            return true;
         } catch (e) {
             LogUtils.Instance.error(AnalyticsMgr.TAG, FwkErrorCode.Analytics.SDKInitFailed, {
                 operation: "_initUmeng",
                 reason: String(e),
                 appKey: this._appKey,
             });
+
+            return false;
         }
     }
 

package/src/Framework/Manager/UserMgr.ts

@@ -1,5 +1,5 @@
 import { FrameworkBase } from "../Definition/FrameworkBase";
-import { EnhanceLoginResult, LocalLoginResult, LoginResult, LoginResultType, ServerGetUserDataResult, ServerLoginResult, ServerUpdateUserDataResult, UpdateUserDataResult, UserBehaviorPlatformInfo, UserDataCategory, UserDataInfo, UserDataKey, UserDataType } from "../Definition/UserDefinition";
+import { EnhanceLoginResult, LocalLoginResult, ServerGetUserDataResult, ServerLoginResult, ServerUpdateUserDataResult, UpdateUserDataResult, UserBehaviorPlatformInfo, UserDataCategory, UserDataInfo, UserDataKey, UserDataType } from "../Definition/UserDefinition";
 import { FwkErrorCode } from "../Definition/FwkErrorDefinition";
 import { LogUtils } from "../Utils/LogUtils";
 import { BaseMgr } from "./BaseMgr";
@@ -240,150 +240,6 @@ export class UserMgr extends BaseMgr {
         }
     }
 
-    /**
-     * 登录
-     * @param needForceLogin 是否强制登录
-     * @param callback 登录回调
-     */
-    public login(needForceLogin: boolean, callback: Function): void {
-        if (callback === null) {
-            LogUtils.Instance.error(UserMgr.TAG, FwkErrorCode.User.InvalidData, {
-                operation: "login",
-                reason: "回调函数为空"
-            });
-            return;
-        }
-
-        if (this.currentPlatformAdapter === null) {
-            LogUtils.Instance.error(UserMgr.TAG, FwkErrorCode.User.NotInit, {
-                operation: "login",
-                reason: "平台适配器未初始化"
-            });
-            callback({
-                type: LoginResultType.Type_LoginFail_ContinueGame,
-            });
-            return;
-        }
-
-        if (this.currentPlatformId === PlatformID.ID_H5_DesktopBrowser ||
-            this.currentPlatformId === PlatformID.ID_MiniGame_ZhiFuBao ||
-            this.currentPlatformId === PlatformID.ID_QuickGame_HuaWei ||
-            this.currentPlatformId === PlatformID.ID_QuickGame_Honor ||
-            this.currentPlatformId === PlatformID.ID_QuickGame_Vivo ||
-            this.currentPlatformId === PlatformID.ID_QuickGame_XiaoMi ||
-            this.currentPlatformId === PlatformID.ID_QuickGame_Oppo
-        ) {
-            needForceLogin = true;
-        }
-
-        LogUtils.Instance.info(UserMgr.TAG, "开始登录", {
-            needForceLogin: needForceLogin,
-        });
-
-        if (!needForceLogin) {
-            this._checkSession().then((loginResult: LoginResult) => {
-                callback(loginResult);
-            }).catch(() => {
-                this._login().then((loginResult: LoginResult) => {
-                    callback(loginResult);
-                }).catch((loginResult: LoginResult) => {
-                    LogUtils.Instance.info(UserMgr.TAG, "用户登录失败（Session检查失败后重试登录）", {
-                        resultType: loginResult.type,
-                        canContinue: loginResult.type === LoginResultType.Type_LoginFail_ContinueGame,
-                    });
-                    callback(loginResult);
-                });
-            });
-        } else {
-            this._login().then((loginResult: LoginResult) => {
-                callback(loginResult);
-            }).catch((loginResult: LoginResult) => {
-                LogUtils.Instance.info(UserMgr.TAG, "用户登录失败（强制登录模式）", {
-                    resultType: loginResult.type,
-                    canContinue: loginResult.type === LoginResultType.Type_LoginFail_ContinueGame
-                });
-                callback(loginResult);
-            });
-        }
-    }
-
-    /** 检查 Session（内部方法） */
-    private _checkSession(): Promise<LoginResult> {
-        return new Promise((resolve, reject) => {
-            if (this.currentPlatformAdapter === null) {
-                reject();
-                return;
-            }
-
-            this.currentPlatformAdapter.checkSession(
-                (isValid: boolean) => {
-                    LogUtils.Instance.info(UserMgr.TAG, "_checkSession()结果", {
-                        isValid: isValid,
-                    });
-
-                    if (isValid) {
-                        resolve({
-                            type: LoginResultType.Type_SessionAvailable,
-                        });
-                    } else {
-                        reject();
-                    }
-                });
-        });
-    }
-
-    /** 登录（内部方法） */
-    private _login(): Promise<LoginResult> {
-        return new Promise((resolve, reject) => {
-            if (this.currentPlatformAdapter === null) {
-                reject("");
-                return;
-            }
-
-            this.currentPlatformAdapter.login(
-                (res) => {
-                    // 华为：playerId 
-                    // 小米：appAccountId
-                    // 其他平台：code
-                    LogUtils.Instance.info(UserMgr.TAG, "_login()成功", {
-                        res: res,
-                    });
-
-                    if (res) {
-                        if (res.code) {
-                            resolve({
-                                type: LoginResultType.Type_LoginSuccess_Auth_Code,
-                            });
-                        } else if (res.playerId || res.appAccountId) {
-                            resolve({
-                                type: LoginResultType.Type_LoginSuccess_Auth_AccountID,
-                            });
-                        } else {
-                            reject({
-                                type: LoginResultType.Type_LoginFail_ContinueGame,
-                            });
-                        }
-                    } else {
-                        reject({
-                            type: LoginResultType.Type_LoginFail_ContinueGame,
-                        });
-                    }
-                }, () => {
-                    LogUtils.Instance.info(UserMgr.TAG, "_login()失败", {});
-
-                    if (this.currentPlatformId === PlatformID.ID_QuickGame_HuaWei) {
-                        reject({
-                            type: LoginResultType.Type_LoginFail_ExitGame,
-                        });
-                    } else {
-                        reject({
-                            type: LoginResultType.Type_LoginFail_ContinueGame,
-                        });
-                    }
-                });
-        });
-    }
-
     public async enhanceLogin(
         loginCallbackFunc: (result: EnhanceLoginResult) => void,
     ): Promise<void> {
@@ -468,6 +324,10 @@ export class UserMgr extends BaseMgr {
             }
         }
 
+        if (this.platformOpenId !== "") {
+            EventMgr.Instance.emit(FrameworkBase.Message.UserMgr_PlatformOpenId_Ready, this.platformOpenId);
+        }
+
         let needServerUserData: boolean = false;
         if (this.uid !== "" && this.userBehaviorPlatformInfo.supportServerUserData) {
             needServerUserData = true;