com.taptap.sdk.core 4.4.2 → 4.5.0

package/Standalone/Runtime/Internal/Http/TapHttp.cs

@@ -5,8 +5,8 @@ namespace TapSDK.Core.Standalone.Internal.Http
     using System;
     using System.Collections.Generic;
     using System.Net.Http.Headers;
+    using System.Text;
     using System.Threading.Tasks;
-    using System.Web;
     using Newtonsoft.Json;
     using TapSDK.Core.Internal.Log;
 
@@ -289,15 +289,21 @@ namespace TapSDK.Core.Standalone.Internal.Http
                 }
                 uriBuilder = new UriBuilder(uri: $"{host}{path}");
             }
+
             if (allQueryParams.Count > 0)
             {
-                var query = HttpUtility.ParseQueryString(uriBuilder.Query);
+                var queryBuilder = new StringBuilder();
                 foreach (var param in allQueryParams)
                 {
-                    query[param.Key] = param.Value.ToString();
+                    // 使用 Uri.EscapeDataString 来编码参数的键和值
+                    queryBuilder.Append($"{Uri.EscapeDataString(param.Key)}={Uri.EscapeDataString(param.Value)}&");
                 }
-                uriBuilder.Query = query.ToString();
+                // 移除末尾的 '&'
+                queryBuilder.Length -= 1;
+
+                uriBuilder.Query = queryBuilder.ToString();
             }
+
             var requestUri = uriBuilder.Uri;
 
             // 创建 HttpRequestMessage
@@ -356,13 +362,13 @@ namespace TapSDK.Core.Standalone.Internal.Http
             {
                 if (TapTapSDK.taptapSdkOptions.enableLog)
                 {
-                    TapHttpUtils.PrintRequest(client, request, request.Content.ReadAsStringAsync().Result);
+                    TapHttpUtils.PrintRequest(client, request);
                 }
                 // 发送请求
                 HttpResponseMessage response = await client.SendAsync(request);
                 if (TapTapSDK.taptapSdkOptions.enableLog)
                 {
-                    TapHttpUtils.PrintResponse(response, response.Content.ReadAsStringAsync().Result);
+                    TapHttpUtils.PrintResponse(response);
                 }
                 // 解析响应
                 return await httpConfig.Parser.Parse<T>(response);

package/Standalone/Runtime/Internal/Http/TapHttpUtils.cs

@@ -50,7 +50,7 @@ namespace TapSDK.Core.Standalone.Internal.Http
             return new string(nonce);
         }
 
-        internal static string GenerateUserAgent()
+        public static string GenerateUserAgent()
         {
             return $"TapSDK-Unity/{TapTapSDK.Version}";
         }
@@ -102,7 +102,7 @@ namespace TapSDK.Core.Standalone.Internal.Http
             return null;
         }
 
-        public static void PrintRequest(HttpClient client, HttpRequestMessage request, string content = null)
+        public static void PrintRequest(HttpClient client, HttpRequestMessage request)
         {
             if (TapLogger.LogDelegate == null)
             {
@@ -136,15 +136,23 @@ namespace TapSDK.Core.Standalone.Internal.Http
                     sb.AppendLine($"\t{header.Key}: {string.Join(",", header.Value.ToArray())}");
                 }
             }
-            if (!string.IsNullOrEmpty(content))
+            string contentString = null;
+            try
+            {
+                contentString = request.Content.ReadAsStringAsync().Result;
+            }
+            catch (Exception)
+            {
+            }
+            if (!string.IsNullOrEmpty(contentString))
             {
-                sb.AppendLine($"Content: \n{content}");
+                sb.AppendLine($"Content: \n{contentString}");
             }
             sb.AppendLine("=== HTTP Request End ===");
             tapLog.Log($"HTTP Request [{request.RequestUri.PathAndQuery}]", sb.ToString());
         }
 
-        public static void PrintResponse(HttpResponseMessage response, string content = null)
+        public static void PrintResponse(HttpResponseMessage response)
         {
             if (TapLogger.LogDelegate == null)
             {
@@ -154,9 +162,17 @@ namespace TapSDK.Core.Standalone.Internal.Http
             sb.AppendLine("=== HTTP Response Start ===");
             sb.AppendLine($"URL: {response.RequestMessage.RequestUri}");
             sb.AppendLine($"Status Code: {response.StatusCode}");
-            if (!string.IsNullOrEmpty(content))
+            string contentString = null;
+            try
+            {
+                contentString = response.Content.ReadAsStringAsync().Result;
+            }
+            catch (Exception)
+            {
+            }
+            if (!string.IsNullOrEmpty(contentString))
             {
-                sb.AppendLine($"Content: {content}");
+                sb.AppendLine($"Content: {contentString}");
             }
             sb.AppendLine("=== HTTP Response End ===");
             tapLog.Log($"HTTP Response [{response.RequestMessage.RequestUri.PathAndQuery}]", sb.ToString());

package/Standalone/Runtime/Internal/Openlog/TapAppDurationStandalone.cs

@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using TapSDK.Core.Internal.Log;
+
+namespace TapSDK.Core.Standalone.Internal.Openlog
+{
+    public class TapAppDurationStandalone
+    {
+        private const string MODULE_NAME = "app_duration";
+
+        private static readonly TapLog log = new TapLog("AppDuration");
+
+        public static void Enable()
+        {
+#if UNITY_STANDALONE
+            // log.Log("Enable");
+            List<string> modules = new List<string> { MODULE_NAME };
+            TapOpenlogWrapper.TdkEnableModules(JsonConvert.SerializeObject(modules));
+#endif
+        }
+
+        public static void Disable()
+        {
+#if UNITY_STANDALONE
+            // log.Log("Disable");
+            List<string> modules = new List<string> { MODULE_NAME };
+            TapOpenlogWrapper.TdkDisableModules(JsonConvert.SerializeObject(modules));
+#endif
+        }
+
+        public static void SetExtraAppDurationParams(Dictionary<string, string> param)
+        {
+#if UNITY_STANDALONE
+            log.Log("SetExtraAppDurationParams param: ", JsonConvert.SerializeObject(param));
+            if (param == null)
+            {
+                log.Warning("SetExtraAppDurationParams param is null");
+                return;
+            }
+            TapOpenlogWrapper.TdkSetExtraAppDurationParams(JsonConvert.SerializeObject(param));
+#endif
+        }
+
+        public static void OnLogin(string openId)
+        {
+#if UNITY_STANDALONE
+            log.Log("OnLogin openId: " + openId);
+            if (openId == null)
+            {
+                log.Warning("OnLogin openId is null");
+                return;
+            }
+            Dictionary<string, string> userInfo = new Dictionary<string, string>
+            {
+                {TapOpenlogParamConstants.PARAM_OPEN_ID, openId}
+            };
+            TapOpenlogWrapper.TdkOnLogin(JsonConvert.SerializeObject(userInfo));
+#endif
+        }
+
+        public static void OnLogout()
+        {
+#if UNITY_STANDALONE
+            log.Log("OnLogout");
+            TapOpenlogWrapper.TdkOnLogout();
+#endif
+        }
+
+        public static void OnForeground()
+        {
+#if UNITY_STANDALONE
+            log.Log("OnForeground");
+            TapOpenlogWrapper.TdkOnForeground();
+#endif
+        }
+
+        public static void OnBackground()
+        {
+#if UNITY_STANDALONE
+            log.Log("OnBackground");
+            TapOpenlogWrapper.TdkOnBackground();
+#endif
+        }
+
+        public static string Version()
+        {
+
+            string v = null;
+#if UNITY_STANDALONE
+            try
+            {
+                v = TapOpenlogWrapper.GetTdkVersion();
+            }
+            catch (Exception e)
+            {
+                log.Error("GetVersion error: " + e.Message);
+            }
+            log.Log("Version: " + v);
+#endif
+            return v;
+        }
+
+        public static string GitCommit()
+        {
+            string v = null;
+#if UNITY_STANDALONE
+            try
+            {
+                v = TapOpenlogWrapper.GetTdkGitCommit();
+            }
+            catch (Exception e)
+            {
+                log.Error("GitCommit error: " + e.Message);
+            }
+            log.Log("GitCommit: " + v);
+#endif
+            return v;
+        }
+    }
+}

package/Standalone/Runtime/Internal/Openlog/{TapOpenlogQueueBase.cs.meta → TapAppDurationStandalone.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b41c2095375aa4c3bbb590c262e02f6a
+guid: dd48e24007af84b75a1587cb282be168
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Standalone/Runtime/Internal/Openlog/TapOpenlogParamConstants.cs

@@ -2,6 +2,7 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
 {
     internal class TapOpenlogParamConstants
     {
+        public const string PARAM_ACTION = "action";
         // 该条日志的唯一标识 d
         public const string PARAM_T_LOG_ID = "t_log_id";
 
@@ -35,9 +36,6 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
         // SDK 运行平台 g
         public const string PARAM_PLATFORM = "platform";
 
-        // 埋点版本号（预留字段），当前全为1 g
-        public const string PARAM_TRACK_CODE = "track_code";
-
         // SDK设置的地区，例如 zh_CN d
         public const string PARAM_SDK_LOCALE = "sdk_locale";
 

package/Standalone/Runtime/Internal/Openlog/TapOpenlogStandalone.cs

@@ -1,33 +1,53 @@
-
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Runtime.InteropServices;
 using Newtonsoft.Json;
 using TapSDK.Core.Internal.Log;
+using TapSDK.Core.Standalone.Internal.Http;
 using UnityEngine;
+#if UNITY_STANDALONE
+using static TapSDK.Core.Standalone.Internal.Openlog.TapOpenlogWrapper;
+#endif
 
 namespace TapSDK.Core.Standalone.Internal.Openlog
 {
     public class TapOpenlogStandalone
     {
         public static string openid = "";
-
-        private static Dictionary<string, string> generalParameter = new Dictionary<string, string>();
-        private static string sessionID = Guid.NewGuid().ToString();
-#if UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN
-        private static TapOpenlogQueueBusiness businessQueue;
-        private static TapOpenlogQueueTechnology technologyQueue;
+        private static readonly Dictionary<string, string> generalParameter = new Dictionary<string, string>();
+        private static readonly Dictionary<string, System.Object> openlogStartParameter = new Dictionary<string, System.Object>();
+        private readonly string sdkProjectName;
+        private readonly string sdkProjectVersion;
+        private static readonly bool isRND = false;
+        private static readonly TapLog log = new TapLog(module: "Openlog");
+#if UNITY_STANDALONE
+        private static readonly CommonVariablesGetter commonVariablesGetter = new CommonVariablesGetter(GetCommonVariables);
+        private static readonly FreeStringCallback freeString = new FreeStringCallback(FreeString);
 #endif
-        private string sdkProjectName;
-        private string sdkProjectVersion;
-
-        private static TapLog log = new TapLog(module: "Openlog");
         public static void Init()
         {
-#if UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN
-            businessQueue = new TapOpenlogQueueBusiness();
-            technologyQueue = new TapOpenlogQueueTechnology();
-#endif
+#if UNITY_STANDALONE
             InitGeneralParameter();
+            InitOpenlogStartParameter();
+            string openlogStartStr = JsonConvert.SerializeObject(openlogStartParameter);
+            int result = TdkOnAppStarted(openlogStartStr, commonVariablesGetter, freeString);
+#endif
+        }
+
+        private static IntPtr GetCommonVariables()
+        {
+            Dictionary<string, string> dynamicProperties = InflateDynamicProperties();
+            string jsonStr = JsonConvert.SerializeObject(dynamicProperties);
+            return Marshal.StringToHGlobalAnsi(jsonStr);
+        }
+
+        private static void FreeString(IntPtr intPtr)
+        {
+            if (intPtr != IntPtr.Zero)
+            {
+                Marshal.FreeHGlobal(intPtr);
+            }
         }
 
         public TapOpenlogStandalone(string sdkProjectName, string sdkProjectVersion)
@@ -41,32 +61,16 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             Dictionary<string, string> properties = null
         )
         {
-            long timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-            string tLogId = Guid.NewGuid().ToString();
-
+#if UNITY_STANDALONE
             if (properties == null)
             {
                 properties = new Dictionary<string, string>();
             }
-            Dictionary<string, string> props = new Dictionary<string, string>(properties);
-            // generalProperties
-            InflateGeneralProperties(props);
-            // dynamicProperties
-            InflateDynamicProperties(props);
-
-            // 该条日志的唯一标识
-            props[TapOpenlogParamConstants.PARAM_T_LOG_ID] = tLogId;
-            // 客户端生成的时间戳，毫秒级
-            props[TapOpenlogParamConstants.PARAM_TIMESTAMP] = timestamp.ToString();
-
-            props["action"] = action;
-
-            TapOpenlogStoreBean bean = new TapOpenlogStoreBean(action, timestamp, tLogId, props);
-            log.Log("LogBusiness action = " + action + ", sdkProjectName = " + sdkProjectName + " , sdkProjectVersion = " + sdkProjectVersion, bean + "\n" + JsonConvert.SerializeObject(properties));
-#if UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN
-            businessQueue.Enqueue(bean);
-#else
-            // log.Log($"This Platform 【{Application.platform}】 is not supported for Openlog.");
+            properties[TapOpenlogParamConstants.PARAM_TAPSDK_PROJECT] = sdkProjectName;
+            properties[TapOpenlogParamConstants.PARAM_TAPSDK_VERSION] = sdkProjectVersion;
+            properties[TapOpenlogParamConstants.PARAM_ACTION] = action;
+            string propertiesStr = JsonConvert.SerializeObject(properties);
+            TdkOpenLog("tapsdk", propertiesStr);
 #endif
         }
 
@@ -75,36 +79,50 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             Dictionary<string, string> properties = null
         )
         {
-            long timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-            string tLogId = Guid.NewGuid().ToString();
-
-            if (properties == null)
+#if UNITY_STANDALONE
+            if (TapCoreStandalone.coreOptions.region == TapTapRegionType.CN && !"TapPayment".Equals(sdkProjectName))
             {
-                properties = new Dictionary<string, string>();
+                // 国内非支付SDK不上报技术日志
+                return;
             }
-            Dictionary<string, string> props = new Dictionary<string, string>(properties);
-            // generalProperties
-            InflateGeneralProperties(props);
-            // dynamicProperties
-            InflateDynamicProperties(props);
-
-            // 该条日志的唯一标识
-            props[TapOpenlogParamConstants.PARAM_T_LOG_ID] = tLogId;
-            // 客户端生成的时间戳，毫秒级
-            props[TapOpenlogParamConstants.PARAM_TIMESTAMP] = timestamp.ToString();
-
-            props["action"] = action;
-
-            TapOpenlogStoreBean bean = new TapOpenlogStoreBean(action, timestamp, tLogId, props);
-
-            log.Log("LogTechnology action = " + action, bean + "\n" + JsonConvert.SerializeObject(properties));
-#if UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN
-            technologyQueue.Enqueue(bean);
-#else
-            // log.Log($"This Platform 【{Application.platform}】 is not supported for Openlog.");
+            Dictionary<string, string> content = InflateDynamicProperties();
+            content[TapOpenlogParamConstants.PARAM_TAPSDK_PROJECT] = sdkProjectName;
+            content[TapOpenlogParamConstants.PARAM_TAPSDK_VERSION] = sdkProjectVersion;
+            content[TapOpenlogParamConstants.PARAM_ACTION] = action;
+            if (properties != null)
+            {
+                content["args"] = JsonConvert.SerializeObject(properties);
+            }
+            string propertiesStr = JsonConvert.SerializeObject(content);
+            TdkOpenLog("tapsdk-apm", propertiesStr);
 #endif
         }
 
+        private static void InitOpenlogStartParameter()
+        {
+            if (isRND)
+            {
+                openlogStartParameter[TapOpenlogStartParamConstants.PARAM_REGION] = 2;
+            }
+            else
+            {
+                openlogStartParameter[TapOpenlogStartParamConstants.PARAM_REGION] = TapCoreStandalone.coreOptions.region;
+            }
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_LOG_TO_CONSOLE] = 1;
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_LOG_LEVEL] = 1;
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_DATA_DIR] = Path.Combine(Application.persistentDataPath, "OpenlogData");
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_ENV] = "local";
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_PLATFORM] = "PC";
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_UA] = TapHttpUtils.GenerateUserAgent();
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_CLIENT_ID] = TapCoreStandalone.coreOptions.clientId;
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_CLIENT_TOKEN] = TapCoreStandalone.coreOptions.clientToken;
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_COMMON] = generalParameter;
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_APP_DURATION] = new Dictionary<string, string>()
+            {
+                {TapOpenlogParamConstants.PARAM_TAPSDK_VERSION, TapTapSDK.Version}
+            };
+        }
+
         private static void InitGeneralParameter()
         {
             // 应用包名
@@ -115,12 +133,8 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             generalParameter[TapOpenlogParamConstants.PARAM_APP_VERSION_CODE] = "";
             // 固定一个枚举值: TapSDK
             generalParameter[TapOpenlogParamConstants.PARAM_PN] = "TapSDK";
-            // SDK 产物类型
-            generalParameter[TapOpenlogParamConstants.PARAM_TAPSDK_ARTIFACT] = "Unity";
-            // SDK 运行平台
-            generalParameter[TapOpenlogParamConstants.PARAM_PLATFORM] = "PC";
-            // 埋点版本号（预留字段），当前全为1
-            generalParameter[TapOpenlogParamConstants.PARAM_TRACK_CODE] = "1";
+            // SDK生成的设备唯一标识
+            generalParameter[TapOpenlogParamConstants.PARAM_DEVICE_ID] = SystemInfo.deviceUniqueIdentifier;
             // SDK生成的设备一次安装的唯一标识
             generalParameter[TapOpenlogParamConstants.PARAM_INSTALL_UUID] = Identity.InstallationId;
             // 设备品牌，eg: Xiaomi
@@ -145,46 +159,34 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             generalParameter[TapOpenlogParamConstants.PARAM_TOTAL_RAM] = DeviceInfo.RAM;
             // 芯片型号，eg：Qualcomm Technologies, Inc SM7250
             generalParameter[TapOpenlogParamConstants.PARAM_HARDWARE] = SystemInfo.processorType;
-            // SDK进程粒度的本地日志 session_id
-            generalParameter[TapOpenlogParamConstants.PARAM_P_SESSION_ID] = sessionID;
-        }
-
-        private void InflateGeneralProperties(Dictionary<string, string> props)
-        {
-            if (generalParameter != null)
-            {
-                foreach (KeyValuePair<string, string> kv in generalParameter)
-                {
-                    props[kv.Key] = kv.Value;
-                }
-            }
+            // SDK设置的地区，例如 zh_CN
+            generalParameter[TapOpenlogParamConstants.PARAM_SDK_LOCALE] = Tracker.getServerLanguage();
+            // taptap的用户ID的外显ID（加密）
+            generalParameter[TapOpenlogParamConstants.PARAM_OPEN_ID] = openid;
         }
 
-        private void InflateDynamicProperties(Dictionary<string, string> props)
+        private static Dictionary<string, string> InflateDynamicProperties()
         {
-
+            Dictionary<string, string> props = new Dictionary<string, string>();
             // 客户端时区，eg：Asia/Shanghai
             props[TapOpenlogParamConstants.PARAM_TIMEZONE] = "";
-            // SDK接入项目具体模块枚举值
-            props[TapOpenlogParamConstants.PARAM_TAPSDK_PROJECT] = sdkProjectName;
-            // SDK 模块版本号
-            props[TapOpenlogParamConstants.PARAM_TAPSDK_VERSION] = sdkProjectVersion;
-            // SDK设置的地区，例如 zh_CN
-            props[TapOpenlogParamConstants.PARAM_SDK_LOCALE] = Tracker.getServerLanguage();
+            // SDK 产物类型
+            props[TapOpenlogParamConstants.PARAM_TAPSDK_ARTIFACT] = "Unity";
             // 游戏账号 ID（非角色 ID）
-            props[TapOpenlogParamConstants.PARAM_GAME_USER_ID] = TapCoreStandalone.User.Id;
+            props[TapOpenlogParamConstants.PARAM_GAME_USER_ID] = TapCoreStandalone.User.Id ?? "";
+            // taptap的用户ID的外显ID（加密）
+            props[TapOpenlogParamConstants.PARAM_OPEN_ID] = openid ?? "";
             // SDK生成的设备全局唯一标识
             props[TapOpenlogParamConstants.PARAM_GID] = "";
-            // SDK生成的设备唯一标识
-            props[TapOpenlogParamConstants.PARAM_DEVICE_ID] = SystemInfo.deviceUniqueIdentifier;
             // 设备可用存储空间（磁盘），单位B
             props[TapOpenlogParamConstants.PARAM_ROM] = "0";
             // 设备可用内存，单位B
             props[TapOpenlogParamConstants.PARAM_RAM] = "0";
-            // taptap的用户ID的外显ID（加密）
-            props[TapOpenlogParamConstants.PARAM_OPEN_ID] = openid;
             // 网络类型，eg：wifi, mobile
             props[TapOpenlogParamConstants.PARAM_NETWORK_TYPE] = "";
+            // SDK设置的地区，例如 zh_CN
+            props[TapOpenlogParamConstants.PARAM_SDK_LOCALE] = Tracker.getServerLanguage();
+            return props;
         }
     }
 }

package/Standalone/Runtime/Internal/Openlog/TapOpenlogStartParamConstants.cs

@@ -0,0 +1,23 @@
+namespace TapSDK.Core.Standalone.Internal.Openlog
+{
+    internal class TapOpenlogStartParamConstants
+    {
+        public const string PARAM_REGION = "region";
+        public const string PARAM_LOG_TO_CONSOLE = "log_to_console";
+        public const string PARAM_LOG_LEVEL = "log_level";
+        public const string PARAM_DATA_DIR = "data_dir";
+        public const string PARAM_ENV = "env";
+        public const string PARAM_PLATFORM = "platform";
+        public const string PARAM_UA = "ua";
+        public const string PARAM_CLIENT_ID = "client_id";
+        public const string PARAM_CLIENT_TOKEN = "client_token";
+        public const string PARAM_MODULES = "modules";
+
+        // Common parameters
+        public const string PARAM_COMMON = "common";
+
+        // App duration parameters
+        public const string PARAM_APP_DURATION = "app_duration";
+        public const string PARAM_TAPSDK_VERSION = "tapsdk_version";
+    }
+}

package/Standalone/Runtime/Internal/Openlog/{Bean/TapOpenlogStoreBean.cs.meta → TapOpenlogStartParamConstants.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8dc8accebab264d03a71480ce67b1bf3
+guid: 57bde0c60960d4f769713d2e12930f75
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2