From b03c29a1bb0e4569b70970c00f56261a5e1dabc4 Mon Sep 17 00:00:00 2001
From: HuYufei <yufei.hu@castbox.fm>
Date: Mon, 8 Jan 2024 15:01:52 +0800
Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=20=E4=BC=98=E5=8C=96Adjust?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=80=BB=E8=BE=91=E5=92=8C=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GuruAnalytics/Runtime/Script/GuruAnalytics.cs   | 13 ++++++++-----
 Runtime/GuruCore/Runtime/Adjust/AdjustService.cs    |  4 ++--
 Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.cs   | 11 ++++++-----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Runtime/GuruAnalytics/Runtime/Script/GuruAnalytics.cs b/Runtime/GuruAnalytics/Runtime/Script/GuruAnalytics.cs
index beacda4..6a51a79 100644
--- a/Runtime/GuruAnalytics/Runtime/Script/GuruAnalytics.cs
+++ b/Runtime/GuruAnalytics/Runtime/Script/GuruAnalytics.cs
@@ -53,18 +53,17 @@ namespace Guru
             }
         }
 
+        private static bool _autoSyncProperties = false;
 
         #region 公用接口
         
         /// <summary>
         /// 初始化接口
         /// </summary>
-        public static void Init(string appId, string deviceInfo, bool isDebug = false)
+        public static void Init(string appId, string deviceInfo, bool isDebug = false, bool syncProperties = false)
         {
+            _autoSyncProperties = syncProperties;
             Agent?.Init(appId, deviceInfo, isDebug);
-#if UNITY_IOS
-            // AnalyticsAgentIOS.TestCrashEvent(); // 测试触发一下崩溃事件
-#endif
         }
 
         /// <summary>
@@ -149,7 +148,8 @@ namespace Guru
         /// <param name="data">INT类型的值</param>
         public static void LogEvent(string eventName, Dictionary<string, dynamic> data = null)
         {
-            UpdateAllUserProperties(); // 每次打点更新用户属性
+            if(_autoSyncProperties)
+                UpdateAllUserProperties(); // 每次打点更新用户属性
             
             string raw = "";
             if (data != null && data.Count > 0)
@@ -241,7 +241,10 @@ namespace Guru
         /// <param name="value"></param>
         private static void CacheUserProperty(string key, string value)
         {
+            bool needUpdate = !UserProperties.ContainsKey(key) || UserProperties[key] != value;
             UserProperties[key] = value;
+
+            // if (needUpdate) UpdateAllUserProperties();
         }
 
 
diff --git a/Runtime/GuruCore/Runtime/Adjust/AdjustService.cs b/Runtime/GuruCore/Runtime/Adjust/AdjustService.cs
index 15664e0..ed8edb3 100644
--- a/Runtime/GuruCore/Runtime/Adjust/AdjustService.cs
+++ b/Runtime/GuruCore/Runtime/Adjust/AdjustService.cs
@@ -30,9 +30,8 @@ namespace Guru
 		/// Adjust启动服务
 		/// </summary>
 		/// <param name="fbAppId">MIR 追踪 AppID</param>
-		public static void StartService(string fbAppId = "")
+		public static void StartService(string appToken, string fbAppId = "")
 		{
-			string appToken = GuruSettings.Instance.AdjustSetting.GetAppToken();
 			if (string.IsNullOrEmpty(appToken))
 			{
 				Log.E(LOG_TAG, "Adjust没有设置token，无法进行初始化");
@@ -140,6 +139,7 @@ namespace Guru
 				Debug.LogWarning($">> Device ID is Empty, skip install event reporting");
 				return;
 			}
+			Debug.LogWarning($"{LOG_TAG} --- addSessionCallbackParameter:  user_pseudo_id:{pseudoId}, device_id:{deviceId}");
 			Adjust.addSessionCallbackParameter("user_pseudo_id", pseudoId);
 			Adjust.addSessionCallbackParameter("device_id", deviceId);
 		}
diff --git a/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.cs b/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.cs
index 977500f..753fb29 100644
--- a/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.cs
+++ b/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.cs
@@ -19,7 +19,6 @@ namespace Guru
 				DependencyStatus = task.Result;
 				if (DependencyStatus == DependencyStatus.Available) 
 				{
-					LinkFirebaseID2Adjust(); // 上报FirebaseID
 					InitializeFirebaseComp();
 					callback?.Invoke();
 				} 
@@ -35,6 +34,7 @@ namespace Guru
 			InitRemoteConfig();	// 老项目沿用此逻辑
 			Analytics.InstallGuruAnalytics(_isDebug); // 初始化Guru自打点
 			Analytics.InitAnalytics();
+			InitAdjustService();
 			
 			if (IPMConfig.IPM_UID.IsNullOrEmpty())
 			{
@@ -79,7 +79,7 @@ namespace Guru
 		/// <summary>
 		/// 关联FirebaseID到Adjust
 		/// </summary>
-		private static void LinkFirebaseID2Adjust()
+		private static void InitAdjustService()
 		{
 			FirebaseAnalytics.GetAnalyticsInstanceIdAsync()
 				.ContinueWithOnMainThread(task =>
@@ -88,15 +88,16 @@ namespace Guru
 					{
 						// 保存本地ID备份
 						string fid = task.Result;
-						StandardProperties.FirebaseId = fid; // 保存本次非空ID
 						IPMConfig.FIREBASE_ID = fid; // 保存FirebaseID
 					}
 					else
 					{
 						UnityEngine.Debug.LogError($"Fetch FirebaseID failed on start!");
 					}
-			
-					AdjustService.StartService();  // 关联启动AdjustService
+					
+					// 启动 AdjustService
+					string appToken = GuruSettings.Instance.AdjustSetting?.GetAppToken() ?? "";
+					AdjustService.StartService(appToken);  
 				});
 		}