From 19a46fff1e067ce58618ae3071458f8e11a88dbf Mon Sep 17 00:00:00 2001
From: huyufei <yufei.hu@castbox.fm>
Date: Wed, 10 Jul 2024 17:12:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=BA=20=20iap=5Fpurchase=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20sandbox=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1020884 --user=yufei.hu 【中台】【BUG】补齐 iap_purchase 打点的 sandbox 参数 https://www.tapd.cn/33527076/s/1156167

Signed-off-by: huyufei <yufei.hu@castbox.fm>
---
 .../Analytics/Analytics.TemplateDefine.cs     | 23 +++++++++++--------
 .../GuruCore/Runtime/Analytics/Analytics.cs   |  5 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Runtime/GuruCore/Runtime/Analytics/Analytics.TemplateDefine.cs b/Runtime/GuruCore/Runtime/Analytics/Analytics.TemplateDefine.cs
index 739bad3..b2d7204 100644
--- a/Runtime/GuruCore/Runtime/Analytics/Analytics.TemplateDefine.cs
+++ b/Runtime/GuruCore/Runtime/Analytics/Analytics.TemplateDefine.cs
@@ -659,12 +659,12 @@ namespace Guru
 			if (orderData.orderType == 1)
 			{
 				// sub_pruchase : Firebase + Guru + Adjust
-				SubPurchase(usdPrice, productId, orderId, orderDate, productToken, receipt);
+				SubPurchase(usdPrice, productId, orderId, orderDate, productToken, receipt, isTest);
 			}
 			else
 			{
 				// iap_purchase : Firebase + Guru + Adjust
-				IAPPurchase(usdPrice, productId, orderId, orderDate, productToken, receipt);
+				IAPPurchase(usdPrice, productId, orderId, orderDate, productToken, receipt, isTest);
 			}
 			
 			// IAP Ret true : Firebase + Guru + Adjust
@@ -685,12 +685,13 @@ namespace Guru
 		/// <param name="orderDate"></param>
 		/// <param name="purchaseToken"></param>
 		/// <param name="receipt"></param>
+		/// <param name="isSandbox"></param>
 		public static void IAPPurchase(double value, string productId, string orderId, string orderDate, 
-			string purchaseToken = "", string receipt = "")
+			string purchaseToken = "", string receipt = "", bool isSandbox = false)
 		{
-			IAPPurchaseReport(EventIAPPurchase, value, productId, orderId, "IAP", orderDate, purchaseToken, receipt);
+			IAPPurchaseReport(EventIAPPurchase, value, productId, orderId, "IAP", orderDate, purchaseToken, receipt, isSandbox);
 		}
-		
+
 		/// <summary>
 		/// SUB 订阅上报
 		/// </summary>
@@ -700,14 +701,15 @@ namespace Guru
 		/// <param name="orderDate"></param>
 		/// <param name="purchaseToken"></param>
 		/// <param name="receipt"></param>
+		/// <param name="isSandbox"></param>
 		public static void SubPurchase(double value, string productId, string orderId, string orderDate, 
-			string purchaseToken = "", string receipt = "")
+			string purchaseToken = "", string receipt = "", bool isSandbox = false)
 		{
-			IAPPurchaseReport(EventSubPurchase, value, productId, orderId, "SUB", orderDate, purchaseToken, receipt);
+			IAPPurchaseReport(EventSubPurchase, value, productId, orderId, "SUB", orderDate, purchaseToken, receipt, isSandbox);
 		}
 		
 		private static void IAPPurchaseReport(string eventName, double value, string productId, 
-			string orderId, string orderType, string orderDate, string purchaseToken = "", string receipt = "")	
+			string orderId, string orderType, string orderDate, string purchaseToken = "", string receipt = "", bool isSandbox = false)	
 		{
 			
 			var dict = new Dictionary<string, dynamic>()
@@ -718,9 +720,12 @@ namespace Guru
 				[ParameterProductId] = productId,
 				["order_id"] = orderId,
 				["order_type"] = orderType,
-				["trans_ts"] = orderDate
+				["trans_ts"] = orderDate,
+				["sandbox"] = isSandbox? "true": "false"
 			};
 			
+			
+			
 			// 上报Firebase + 自打点
 			LogEvent(eventName, dict, new EventSetting() { EnableFirebaseAnalytics = true });
 			
diff --git a/Runtime/GuruCore/Runtime/Analytics/Analytics.cs b/Runtime/GuruCore/Runtime/Analytics/Analytics.cs
index 42f1631..6a26539 100644
--- a/Runtime/GuruCore/Runtime/Analytics/Analytics.cs
+++ b/Runtime/GuruCore/Runtime/Analytics/Analytics.cs
@@ -1,5 +1,4 @@
 
-using UnityEngine;
 
 namespace Guru
 {
@@ -8,6 +7,7 @@ namespace Guru
 	using System.Collections.Generic;
 	using com.adjust.sdk;
 	using Facebook.Unity;
+	using UnityEngine;
 	using Firebase.Analytics;
 	using Firebase.Crashlytics;
 	
@@ -197,7 +197,7 @@ namespace Guru
 			string paramStr = string.Join(",", extras);
 			Log.I(TAG, $"eventName:{eventName}, params:{paramStr}");
 
-			eventSetting ??= _defaultEventSetting;
+			if (eventSetting == null) eventSetting = _defaultEventSetting;
 			if (eventSetting.EnableFirebaseAnalytics)
 			{
 				List<Parameter> parameters = new List<Parameter>();
@@ -219,7 +219,6 @@ namespace Guru
 						parameters.Add(new Parameter(kv.Key, decimal.ToDouble(decimalValue)));
 					else
 						parameters.Add(new Parameter(kv.Key, kv.Value.ToString()));
-					
 				}
 				
 				FirebaseAnalytics.LogEvent(eventName, parameters.ToArray());