update: 优化Adjust 启动逻辑和点位赋值

Signed-off-by: huyufei <yufei.hu@castbox.fm>

Runtime/GuruAdjust/AdjustService.cs

@@ -84,7 +84,6 @@ namespace Guru
 			config.setLogDelegate(log => LogI(LOG_TAG, log));
 			config.setEventSuccessDelegate(OnEventSuccessCallback);
 			config.setEventFailureDelegate(OnEventFailureCallback);
-			
 			config.setSessionFailureDelegate(OnSessionFailureCallback);
 			config.setAttributionChangedDelegate(OnAttributionChangedCallback);
 #endif
@@ -92,9 +91,6 @@ namespace Guru
 			SetupInstance();
 			Adjust.start(config);
 			
-			// 缓存标准属性
-			_adjustId = Adjust.getAdid(); // 获取AdjustID
-			
 			// 异步加载AdId
 			FetchGoogleAdId();
 
@@ -165,6 +161,21 @@ namespace Guru
 		#endregion
 		
 		#region 事件回调函数
+		
+		/// <summary>
+		/// Session 启动后回调
+		/// 回调中可以获取实际的 AdjustID
+		/// </summary>
+		/// <param name="sessionSuccessData"></param>
+		private static void OnSessionSuccessCallback(AdjustSessionSuccess sessionSuccessData)
+		{
+			LogI(LOG_TAG,$"{LOG_TAG} --- Session tracked successfully!");
+
+			var adid = sessionSuccessData.Adid;
+			_adjustId = adid;
+			_onSessionSuccessCallback?.Invoke(adid);
+		}
+		
 
 		private static void OnAttributionChangedCallback(AdjustAttribution attributionData)
 		{
@@ -283,14 +294,6 @@ namespace Guru
 			LogI(LOG_TAG, "WillRetry: " + eventFailureData.WillRetry.ToString());
 		}
 
-		private static void OnSessionSuccessCallback(AdjustSessionSuccess sessionSuccessData)
-		{
-			LogI(LOG_TAG,$"{LOG_TAG} --- Session tracked successfully!");
-
-			var adid = sessionSuccessData.Adid;
-			_onSessionSuccessCallback?.Invoke(adid);
-		}
-
 		private static void OnSessionFailureCallback(AdjustSessionFailure sessionFailureData)
 		{
 			LogI(LOG_TAG,"Session tracking failed!");

Runtime/GuruCore/Runtime/Analytics/Analytics.Custom.cs

@@ -185,6 +185,8 @@ namespace Guru
 		/// </summary>
 		private static void FetchFirebaseId()
 		{
+			if (!IsFirebaseReady) return;
+			
 			FirebaseAnalytics.GetAnalyticsInstanceIdAsync()
 				.ContinueWithOnMainThread(task =>
 			{

Runtime/GuruCore/Runtime/Analytics/Analytics.cs

@@ -44,18 +44,17 @@ namespace Guru
 		public static bool EnableDebugAnalytics;	//允许Debug包上报打点
 
 		public static bool IsDebugMode => PlatformUtil.IsDebug();
+		private static bool IsFirebaseReady => FirebaseUtil.IsFirebaseInitialized;
 		
 		private static bool IsEnable 
 		{
 			get
 			{
 				//Analytics没有初始化不上报打点
-				if (!_isInited)
+				if (!_isInited) return false;
-					return false;
 				
 				//Firebase服务没有初始化完成不上报打点
-				if (!FirebaseUtil.IsFirebaseInitialized)
+				if (!IsFirebaseReady) return false;
-					return false;
 				
 #if !UNITY_EDITOR 
 				//开发环境打点不上报

Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.cs

@@ -118,9 +118,7 @@ namespace Guru
 					string fbAppId = GuruSettings.Instance.IPMSetting.FacebookAppId;
 
 					if (!string.IsNullOrEmpty(IPMConfig.ADJUST_ID))
-					{
 						ReportAdjustId(IPMConfig.ADJUST_ID); // 二次启动后，若有值则立即上报属性
-					}
 					
 					AdjustService.StartService(appToken, fbAppId, OnGetAdjustId, OnAdjustDeeplinkCallback);