Merge branch 'deeplink' into dev
Signed-off-by: huyufei <yufei.hu@castbox.fm> # Conflicts: # Runtime/GuruAdjust/AdjustService.cs # Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.csdev
						commit
						c88de190a1
					
				|  | @ -50,7 +50,8 @@ namespace Guru | |||
| 		/// </summary> | ||||
| 		/// <param name="appToken"></param> | ||||
| 		/// <param name="fbAppId">MIR 追踪 AppID</param> | ||||
| 		public static void StartService(string appToken, string fbAppId = "", Action<string> onSessionSuccess = null) | ||||
| 		/// <param name="onDeeplinkCallback"></param> | ||||
| 		public static void StartService(string appToken, string fbAppId = "", Action<string> onDeeplinkCallback = null) | ||||
| 		{ | ||||
| 			if (string.IsNullOrEmpty(appToken)) | ||||
| 			{ | ||||
|  | @ -66,9 +67,12 @@ namespace Guru | |||
| 			AdjustConfig config = new AdjustConfig(appToken, environment); | ||||
| 			config.setLogLevel(GetAdjustLogLevel()); | ||||
| 			config.setDelayStart(DelayTime); | ||||
|              | ||||
| 			config.setPreinstallTrackingEnabled(true); // Adjust Preinstall | ||||
| 			config.setSessionSuccessDelegate(OnSessionSuccessCallback); // SessionSuccess | ||||
| 			 | ||||
| 			if(onDeeplinkCallback != null) | ||||
| 				config.setDeferredDeeplinkDelegate(onDeeplinkCallback); | ||||
|              | ||||
| 
 | ||||
| #if UNITY_ANDROID | ||||
| 			if (!string.IsNullOrEmpty(fbAppId)) config.setFbAppId(fbAppId); // 注入 MIR ID | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ namespace Guru | |||
| 	public static partial class FirebaseUtil | ||||
| 	{ | ||||
| 		private static readonly string LOG_TAG = "Firebase"; | ||||
| 		private static bool _isDebug = false; | ||||
| 		private static bool _isReady = false; | ||||
| 		public static bool IsReady => _isReady; | ||||
| 		 | ||||
|  | @ -19,13 +18,12 @@ namespace Guru | |||
| 
 | ||||
| 		public static Action<bool> OnFirebaseAuthResult; | ||||
| 		public static Action<bool> OnUserAuthResult; | ||||
| 		public static Action<string> OnAdjustDeeplinkCallback = null; | ||||
| 		 | ||||
| 		 | ||||
| 		 | ||||
| 		public static void InitFirebase(Action callback, bool isDebug = false) | ||||
| 		public static void InitFirebase(Action callback) | ||||
| 		{ | ||||
| 			_isReady = false; | ||||
| 			_isDebug = isDebug; | ||||
| 			Analytics.InitAnalytics(); // 打点提前初始化 | ||||
| 			 | ||||
| 			// Loom.StartUp(); // 确保主线程开启 | ||||
|  | @ -103,6 +101,7 @@ namespace Guru | |||
| 			FirebaseAnalytics.GetAnalyticsInstanceIdAsync() | ||||
| 				.ContinueWithOnMainThread(task => | ||||
| 				{ | ||||
| 					 | ||||
| 					if (task.IsCompleted && !string.IsNullOrEmpty(task.Result))  | ||||
| 					{ | ||||
| 						// 保存本地ID备份 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue