diff --git a/Runtime/GuruCore/Runtime/Analytics/Analytics.cs b/Runtime/GuruCore/Runtime/Analytics/Analytics.cs index 9986dc8..26e7723 100644 --- a/Runtime/GuruCore/Runtime/Analytics/Analytics.cs +++ b/Runtime/GuruCore/Runtime/Analytics/Analytics.cs @@ -1,15 +1,17 @@ -using System.Collections; namespace Guru { using System; using System.Collections.Generic; using com.adjust.sdk; + using System.Collections; using Facebook.Unity; using Firebase.Analytics; using Firebase.Crashlytics; + using UnityEngine; + //打点模块初始化和基础接口封装 public static partial class Analytics @@ -71,26 +73,25 @@ namespace Guru EnableAdjustAnalytics = analyticsSetting.EnalbeAdjustAnalytics }; } - - FirebaseUtil.onInitComplete += OnFirebaseCompleted; } - private static void OnFirebaseCompleted(bool success) + /// + /// Firebase 初始化完成 + /// + public static void OnFirebaseCompleted() { - FirebaseUtil.onInitComplete -= OnFirebaseCompleted; - - if (success) + Debug.Log($"[SDK][ANU] --- OnFirebaseCompleted ---"); + + Crashlytics.IsCrashlyticsCollectionEnabled = true; + if (_defaultEventSetting.EnableFirebaseAnalytics) { - Crashlytics.IsCrashlyticsCollectionEnabled = true; - if (_defaultEventSetting.EnableFirebaseAnalytics) - { - FirebaseAnalytics.SetAnalyticsCollectionEnabled(true); - FirebaseAnalytics.SetSessionTimeoutDuration(new TimeSpan(0, 30, 0)); - SetUserProperty(FirebaseAnalytics.UserPropertySignUpMethod, "Google"); - SetUserProperty(PropertyDeviceID, IPMConfig.IPM_DEVICE_ID); - // SetUserProperty(PropertyFirstOpenTime, FirstOpenTime); - } + FirebaseAnalytics.SetAnalyticsCollectionEnabled(true); + FirebaseAnalytics.SetSessionTimeoutDuration(new TimeSpan(0, 30, 0)); + SetUserProperty(FirebaseAnalytics.UserPropertySignUpMethod, "Google"); + SetUserProperty(PropertyDeviceID, IPMConfig.IPM_DEVICE_ID); + // SetUserProperty(PropertyFirstOpenTime, FirstOpenTime); } + } #endregion @@ -383,7 +384,6 @@ namespace Guru #endregion } - internal class SavedLog { public string key; diff --git a/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.cs b/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.cs index 9291405..0680ab1 100644 --- a/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.cs +++ b/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.cs @@ -32,6 +32,7 @@ namespace Guru { _isReady = false; _onDeeplinkCallback = onDeeplinkCallback; + Analytics.InitAnalytics(); // 初始化 Fireabse 依赖 FirebaseApp.CheckAndFixDependenciesAsync().ContinueWithOnMainThread(task => { @@ -51,9 +52,10 @@ namespace Guru } private static void InitializeFirebaseComp() { + Analytics.OnFirebaseCompleted(); // Firebase 初始化回调 InitCrashlytics(); // 老项目沿用此逻辑 InitRemoteConfig(); // 老项目沿用此逻辑 - InitAdjustService(); // 初始化 Firebase 服务 + InitAssetByFirebaseIdAsync(); // 获取到 FirebaseID 后异步执行逻辑 if (IPMConfig.IPM_UID.IsNullOrEmpty()) { @@ -119,7 +121,6 @@ namespace Guru //--- 结束后启动相关的服务 --- InitAdjustService(_onDeeplinkCallback); // 启动 AdjustService - InitAnalytics(); // 初始化打点逻辑和实现 }); }