com.taptap.sdk.core 4.3.4 → 4.3.8-alpha.2

package/Mobile/Editor/NativeDependencies.xml

@@ -5,17 +5,17 @@
         <repositories>
             <repository>https://repo.maven.apache.org/maven2</repository>
         </repositories>
-        <androidPackage spec="com.taptap.sdk:tap-core-unity:4.3.4"/>
+        <androidPackage spec="com.taptap.sdk:tap-core-unity:4.3.8-alpha.11"/>
     </androidPackages>
 
     <!-- iOS Cocoapod dependencies can be specified by each iosPod element. -->
     <iosPods>
         <sources>
-            <source>https://github.com/CocoaPods/Specs.git</source>
+            <source>git@git.gametaptap.com:ios/international/TapSDK4-iOS-podspecs.git</source>
         </sources>
 
         <iosPod name="Protobuf" version="~> 3.0" bitcodeEnabled="false" addToAllTargets="false"/>
-        <iosPod name="TapTapCoreSDK" version="~> 4.3.4" bitcodeEnabled="false" addToAllTargets="false"/>
+        <iosPod name="TapTapCoreSDK" version="~> 4.3.8-alpha.1" bitcodeEnabled="false" addToAllTargets="false"/>
 
     </iosPods>
 

package/Mobile/Runtime/TapCoreMobile.cs

@@ -24,7 +24,7 @@ namespace TapSDK.Core.Mobile
         public void Init(TapTapSDKCoreOptions coreOption, TapTapSDKBaseOption[] otherOptions)
         {
             Debug.Log("TapCoreMobile SDK inited");
-            SetPlatformAndVersion(TapTapSDK.SDKPlatform, TapTapSDK.SDKVersion);
+            SetPlatformAndVersion(TapTapSDK.SDKPlatform, TapTapSDK.Version);
             string coreOptionsJson = JsonUtility.ToJson(coreOption);
             string[] otherOptionsJson = otherOptions.Select(option => JsonConvert.SerializeObject(option)).ToArray();
             Bridge.CallHandler(EngineBridgeInitializer.GetBridgeServer()
@@ -40,7 +40,7 @@ namespace TapSDK.Core.Mobile
             Bridge.CallHandler(EngineBridgeInitializer.GetBridgeServer()
                 .Method("setPlatformAndVersion")
                 .Args("platform", TapTapSDK.SDKPlatform)
-                .Args("version", TapTapSDK.SDKVersion)
+                .Args("version", TapTapSDK.Version)
                 .CommandBuilder());
             SetSDKArtifact("Unity");
         }

package/Runtime/Internal/Log/TapLog.cs

@@ -0,0 +1,117 @@
+using UnityEngine;
+
+namespace TapSDK.Core.Internal.Log
+{
+    public class TapLog
+    {
+        private const string TAG = "TapSDKUnity";
+        // 颜色常量
+        private const string InfoColor = "#FFFFFF"; // 白色
+        private const string WarningColor = "#FFFF00"; // 黄色
+        private const string ErrorColor = "#FF0000"; // 红色
+        private const string MainThreadColor = "#00FF00"; // 绿色
+        private const string IOThreadColor = "#FF00FF"; // 紫色
+        private const string TagColor = "#00FFFF"; // 青色
+
+        // 开关变量，控制是否启用日志输出
+        public static bool Enabled = false;
+
+        private string module;
+        private string tag;
+
+        public TapLog(string module, string tag = TAG)
+        {
+            this.tag = tag;
+            this.module = module;
+        }
+
+        public void Log(string message, string detail = null)
+        {
+            TapLog.Log(message, detail, tag, module);
+        }
+
+        // 输出带有自定义颜色和标签的警告
+        public void Warning(string message, string detail = null)
+        {
+            TapLog.Warning(message, detail, tag, module);
+        }
+
+        // 输出带有自定义颜色和标签的错误
+        public void Error(string message, string detail = null)
+        {
+            TapLog.Error(message, detail, tag, module);
+        }
+
+        // 输出带有自定义颜色和标签的普通日志
+        public static void Log(string message, string detail = null, string tag = TAG, string module = null)
+        {
+            if (Enabled)
+            {
+                Debug.Log(GetFormattedMessage(message: message, detail: detail, colorHex: InfoColor, tag: tag, module: module));
+            }
+        }
+
+        // 输出带有自定义颜色和标签的警告
+        public static void Warning(string message, string detail = null, string tag = TAG, string module = null)
+        {
+            if (Enabled)
+            {
+                Debug.LogWarning(GetFormattedMessage(message: message, detail: detail, colorHex: WarningColor, tag: tag, module: module));
+            }
+        }
+
+        // 输出带有自定义颜色和标签的错误
+        public static void Error(string message, string detail = null, string tag = TAG, string module = null)
+        {
+            if (Enabled)
+            {
+                Debug.LogError(GetFormattedMessage(message: message, detail: detail, colorHex: ErrorColor, tag: tag, module: module));
+            }
+        }
+
+        // 格式化带有颜色和标签的消息
+        private static string GetFormattedMessage(string message, string detail, string colorHex, string tag, string module)
+        {
+            string threadInfo = GetThreadInfo();
+            string tagColor = TagColor;
+            if (module != null && module != "")
+            {
+                tag = $"{tag}.{module}";
+            }
+            if (IsMobilePlatform())
+            {
+                return $"[{tag}] {threadInfo} {message}\n{detail}";
+            }
+            else
+            {
+                return $"<color={tagColor}>[{tag}]</color> {threadInfo} <color={colorHex}>{message}</color>\n{detail}\n";
+            }
+
+        }
+
+        // 获取当前线程信息
+        private static string GetThreadInfo()
+        {
+            bool isMainThread = System.Threading.Thread.CurrentThread.IsAlive && System.Threading.Thread.CurrentThread.ManagedThreadId == 1;
+            string threadInfo = isMainThread ? "Main Thread" : $"IO Thread {System.Threading.Thread.CurrentThread.ManagedThreadId}";
+
+            if (IsMobilePlatform())
+            {
+                // 移动平台的线程信息不使用颜色
+                return $"({threadInfo})";
+            }
+            else
+            {
+                // 其他平台的线程信息使用颜色
+                string color = isMainThread ? MainThreadColor : IOThreadColor;
+                return $"<color={color}>({threadInfo})</color>";
+            }
+        }
+
+        // 检查是否是移动平台
+        private static bool IsMobilePlatform()
+        {
+            return Application.platform == RuntimePlatform.Android || Application.platform == RuntimePlatform.IPhonePlayer;
+        }
+    }
+}

package/Runtime/Internal/Log/TapLog.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f9613fc51bb6646d89b77a0fde4d4b40
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Internal/Log.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ee253dc23c74a430e91bd9791fb9043d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Public/TapTapEvent.cs

@@ -81,7 +81,7 @@ namespace TapSDK.Core {
         public static void ClearAllCommonProperties(){
             platformWrapper?.ClearAllCommonProperties();
         }
-        public static void LogChargeEvent(string orderID, string productName, long amount, string currencyType, string paymentMethod, string properties){
+        public static void LogPurchasedEvent(string orderID, string productName, long amount, string currencyType, string paymentMethod, string properties){
             platformWrapper?.LogChargeEvent(orderID, productName, amount, currencyType,  paymentMethod, properties);
         }
     

package/Runtime/Public/TapTapSDK.cs

@@ -7,10 +7,11 @@ using System.Collections.Generic;
 using UnityEngine;
 using System.Reflection;
 using TapSDK.Core.Internal.Init;
+using TapSDK.Core.Internal.Log;
 
 namespace TapSDK.Core {
     public class TapTapSDK {
-        public static readonly string SDKVersion = "4.3.4";
+        public static readonly string Version = "4.3.4";
         public static readonly int SDKVersionCode = 32900001;
         public static string SDKPlatform = "TapSDK-Unity";
 
@@ -37,6 +38,7 @@ namespace TapSDK.Core {
             if (string.IsNullOrEmpty(coreOption.clientId))
                 throw new ArgumentException("[TapSDK] clientID is null or empty!");
             TapTapSDK.tapTapSDKCoreOptions = coreOption;
+            TapLog.Enabled = coreOption.enableLog;
             platformWrapper?.Init(coreOption);
              // 初始化各个模块
             
@@ -61,6 +63,7 @@ namespace TapSDK.Core {
                 throw new ArgumentException("[TapSDK] clientID is null or empty!");
 
             TapTapSDK.tapTapSDKCoreOptions = coreOption;
+            TapLog.Enabled = coreOption.enableLog;
             platformWrapper?.Init(coreOption,otherOptions);
 
             Type[] initTaskTypes = GetInitTypeList();

package/Standalone/Runtime/Internal/EventSender.cs

@@ -35,7 +35,7 @@ namespace TapSDK.Core.Standalone.Internal {
             // 初始化 HttpClient
             var header = new Dictionary<string, string>
             {
-                { "User-Agent", $"{TapTapSDK.SDKPlatform}/{TapTapSDK.SDKVersion}" }
+                { "User-Agent", $"{TapTapSDK.SDKPlatform}/{TapTapSDK.Version}" }
             };
 
             var coreOptions = TapCoreStandalone.coreOptions;

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

@@ -25,7 +25,7 @@ namespace TapSDK.Core.Standalone.Internal
         public static Dictionary<string, string> commonHeaders {
             get {
                 var headers = new Dictionary<string, string> {
-                    { "User-Agent", $"{TapTapSDK.SDKPlatform}/{TapTapSDK.SDKVersion}" },
+                    { "User-Agent", $"{TapTapSDK.SDKPlatform}/{TapTapSDK.Version}" },
                     { "X-Tap-Ts", TimeUtil.GetCurrentTime().ToString() },
                     { "X-Tap-Nonce", NetUtils.GenerateNonce() },
                     { "X-Tap-PN", "TapSDK" },
@@ -33,7 +33,7 @@ namespace TapSDK.Core.Standalone.Internal
                     { "X-Tap-Device-Id", Identity.DeviceId },
                     { "X-Tap-Platform", "PC" },
                     { "X-Tap-SDK-Module", "TapSDKCore" },
-                    { "X-Tap-SDK-Module-Version", TapTapSDK.SDKVersion },
+                    { "X-Tap-SDK-Module-Version", TapTapSDK.Version },
                     { "X-Tap-SDK-Artifact", "Unity" }
                 };
                 

package/Standalone/Runtime/Internal/Openlog/Bean/TapOpenlogLogGroup.cs

@@ -0,0 +1,39 @@
+#if UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN
+using Newtonsoft.Json;
+using ProtoBuf;
+using System.Collections.Generic;
+
+namespace TapSDK.Core.Standalone.Internal
+{
+    [ProtoContract]
+    public class LogContent
+    {
+        [JsonProperty("Key")]
+        [ProtoMember(1)]
+        public string Key { get; set; }
+
+        [JsonProperty("Value")]
+        [ProtoMember(2)]
+        public string Value { get; set; }
+    }
+
+    [ProtoContract]
+    public class Log
+    {
+        [JsonProperty("Value")]
+        [ProtoMember(1)]
+        public uint Time { get; set; }
+        [JsonProperty("Contents")]
+        [ProtoMember(2)]
+        public List<LogContent> Contents { get; set; }
+    }
+
+    [ProtoContract]
+    public class LogGroup
+    {
+        [JsonProperty("Logs")]
+        [ProtoMember(1)]
+        public List<Log> Logs { get; set; }
+    }
+}
+#endif

package/Standalone/Runtime/Internal/Openlog/Bean/TapOpenlogLogGroup.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3408a0ca858fb4782bacbdbca16a5a41
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Standalone/Runtime/Internal/Openlog/Bean/TapOpenlogStoreBean.cs

@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace TapSDK.Core.Standalone.Internal.Openlog
+{
+    public class TapOpenlogStoreBean
+    {
+        [JsonProperty("action")]
+        public string action;
+
+        [JsonProperty("timestamp")]
+        public long timestamp;
+
+        [JsonProperty("t_log_id")]
+        public string tLogId;
+
+        [JsonProperty("props")]
+        public readonly Dictionary<string, string> props;
+
+        public TapOpenlogStoreBean(string action, long timestamp, string tLogId, Dictionary<string, string> props)
+        {
+            this.action = action;
+            this.timestamp = timestamp;
+            this.tLogId = tLogId;
+            this.props = props;
+        }
+
+        public override string ToString()
+        {
+            return $"TapOpenlogStoreBean(action: {action} , tLogId: {tLogId} , timestamp: {timestamp})";
+        }
+    }
+}

package/Standalone/Runtime/Internal/Openlog/Bean/TapOpenlogStoreBean.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8dc8accebab264d03a71480ce67b1bf3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Standalone/Runtime/Internal/Openlog/Bean.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7e49d7f2e1e5b4eaf90b7cf14770d8f8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,163 @@
+#if UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN
+using System;
+using System.Threading.Tasks;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using TapSDK.Core.Internal.Log;
+using K4os.Compression.LZ4;
+
+namespace TapSDK.Core.Standalone.Internal
+{
+    public class TapOpenlogHttpClient
+    {
+
+        private const string HOST_CN = "openlog.xdrnd.cn";
+        private const string HOST_IO = "openlog.xdrnd.cn";
+
+        private string GetHost()
+        {
+            if (TapCoreStandalone.coreOptions.region == TapTapRegionType.CN)
+            {
+                return HOST_CN;
+            }
+            else if (TapCoreStandalone.coreOptions.region == TapTapRegionType.Overseas)
+            {
+                return HOST_IO;
+            }
+            else
+            {
+                return HOST_CN;
+            }
+        }
+
+        private static TapLog log = new TapLog(module: "Openlog.HttpClient");
+
+        private static System.Net.Http.HttpClient client;
+
+        public TapOpenlogHttpClient()
+        {
+            var ip = "http://172.26.200.194:8888";
+            ServicePointManager.ServerCertificateValidationCallback += (sender, certificate, chain, sslPolicyErrors) =>
+            {
+                return true;
+            };
+            HttpClientHandler clientHandler = new HttpClientHandler
+            {
+                Proxy = new WebProxy(ip)
+            };
+            client = new System.Net.Http.HttpClient(clientHandler);
+        }
+
+        public async Task<bool> Post(string path, byte[] content)
+        {
+            string url = BuildUrl(path);
+            var request = new HttpRequestMessage(HttpMethod.Post, url);
+
+            request.Headers.Add("User-Agent", "TapSDK-Unity/" + TapTapSDK.Version);
+            request.Headers.Add("Accept", "*/*");
+            request.Headers.Add("x-log-apiversion", "0.6.0");
+            request.Headers.Add("x-log-compresstype", "lz4");
+            request.Headers.Add("x-log-signaturemethod", "hmac-sha1");
+            request.Headers.Add("x-log-timestamp", DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString());
+            request.Headers.Add("x-log-bodyrawsize", content.Length.ToString());
+
+            byte[] compressContent = LZ4Compress(content);
+            // byte[] compressContent = content;
+
+            var contentMD5 = EncryptString(compressContent);
+            request.Headers.Add("x-content-md5", contentMD5);
+
+            string methodPart = request.Method.Method;
+            string urlPath = request.RequestUri.LocalPath;
+            string headersPart = GetHeadersPart(request.Headers);
+            string signParts = methodPart + "\n" + contentMD5 + "\n" + "application/x-protobuf" + "\n" + headersPart + "\n" + urlPath;
+            string sign;
+            using (var hmac = new HMACSHA1(Encoding.UTF8.GetBytes(TapCoreStandalone.coreOptions.clientToken)))
+            {
+                byte[] hash = hmac.ComputeHash(Encoding.UTF8.GetBytes(signParts));
+                sign = Convert.ToBase64String(hash);
+            }
+
+            request.Headers.Add("Authorization", "LOG " + TapCoreStandalone.coreOptions.clientId + ":" + sign);
+
+            ByteArrayContent requestContent = new ByteArrayContent(compressContent);
+            requestContent.Headers.ContentType = new MediaTypeHeaderValue("application/x-protobuf");
+            request.Content = requestContent;
+
+            return await SendRequest(request);
+        }
+
+        private static string EncryptString(byte[] str)
+        {
+            var md5 = MD5.Create();
+            byte[] byteOld = str;
+            byte[] byteNew = md5.ComputeHash(byteOld);
+            var sb = new StringBuilder();
+            foreach (byte b in byteNew)
+            {
+                sb.Append(b.ToString("X2"));
+            }
+            return sb.ToString();
+        }
+
+        private static byte[] LZ4Compress(byte[] data)
+        {
+            int maxCompressedLength = LZ4Codec.MaximumOutputSize(data.Length);
+            byte[] compressedData = new byte[maxCompressedLength];
+            int compressedLength = LZ4Codec.Encode(data, 0, data.Length, compressedData, 0, compressedData.Length);
+
+            byte[] result = new byte[compressedLength];
+            Array.Copy(compressedData, result, compressedLength);
+            return result;
+        }
+
+        private static string GetHeadersPart(HttpRequestHeaders headers)
+        {
+            var headerKeys = headers
+                .Where(h => h.Key.StartsWith("x-log-", StringComparison.OrdinalIgnoreCase))
+                .OrderBy(h => h.Key.ToLowerInvariant())
+                .Select(h => $"{h.Key.ToLowerInvariant()}:{string.Join(",", h.Value)}")
+                .ToList();
+
+            return string.Join("\n", headerKeys);
+        }
+
+        private async Task<bool> SendRequest(HttpRequestMessage request)
+        {
+            HttpResponseMessage response;
+            try
+            {
+                response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
+                request.Dispose();
+            }
+            catch (HttpRequestException e)
+            {
+                log.Warning($"Request error", e.ToString());
+                return false;
+            }
+
+            if (response.IsSuccessStatusCode || (response.StatusCode >= HttpStatusCode.BadRequest && response.StatusCode < HttpStatusCode.InternalServerError))
+            {
+                response.Dispose();
+                return true;
+            }
+            else
+            {
+                log.Warning($"SendOpenlog failed", response.StatusCode.ToString());
+                response.Dispose();
+                return false;
+            }
+        }
+
+        private string BuildUrl(string path)
+        {
+            string url = $"https://{GetHost()}/{path}?client_id={TapCoreStandalone.coreOptions.clientId}";
+            return url;
+        }
+    }
+}
+#endif

package/Standalone/Runtime/Internal/Openlog/TapOpenlogHttpClient.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: db5b5756edc624e2fbb3bc1f01459814
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,104 @@
+namespace TapSDK.Core.Standalone.Internal.Openlog
+{
+    internal class TapOpenlogParamConstants
+    {
+        // 该条日志的唯一标识 d
+        public const string PARAM_T_LOG_ID = "t_log_id";
+
+        // 客户端时区，eg：Asia/Shanghai d
+        public const string PARAM_TIMEZONE = "timezone";
+
+        // 客户端生成的时间戳，毫秒级 d
+        public const string PARAM_TIMESTAMP = "timestamp";
+
+        // 应用包名 g
+        public const string PARAM_APP_PACKAGE_NAME = "app_package_name";
+
+        // 应用版本字符串 g
+        public const string PARAM_APP_VERSION = "app_version";
+
+        // 应用版本（数字） g
+        public const string PARAM_APP_VERSION_CODE = "app_version_code";
+
+        // 固定一个枚举值: TapSDK g
+        public const string PARAM_PN = "pn";
+
+        // SDK接入项目具体模块枚举值 d
+        public const string PARAM_TAPSDK_PROJECT = "tapsdk_project";
+
+        // SDK 模块版本号 d
+        public const string PARAM_TAPSDK_VERSION = "tapsdk_version";
+
+        // SDK 产物类型 d
+        public const string PARAM_TAPSDK_ARTIFACT = "tapsdk_artifact";
+
+        // 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";
+
+        // 游戏账号 ID（非角色 ID）d
+        public const string PARAM_GAME_USER_ID = "game_user_id";
+
+        // SDK生成的设备全局唯一标识 d
+        public const string PARAM_GID = "gid";
+
+        // SDK生成的设备唯一标识 d
+        public const string PARAM_DEVICE_ID = "device_id";
+
+        // SDK生成的设备一次安装的唯一标识 d
+        public const string PARAM_INSTALL_UUID = "install_uuid";
+
+        // 设备品牌，eg: Xiaomi d
+        public const string PARAM_DV = "dv";
+
+        // 设备品牌型号，eg：21051182C d
+        public const string PARAM_MD = "md";
+
+        // 设备CPU型号，eg：arm64-v8a d
+        public const string PARAM_CPU = "cpu";
+
+        // 支持 CPU 架构，eg：arm64-v8a d
+        public const string PARAM_CPU_ABIS = "cpu_abis";
+
+        // 设备操作系统 d
+        public const string PARAM_OS = "os";
+
+        // 设备操作系统版本 d
+        public const string PARAM_SV = "sv";
+
+        // 物理设备真实屏幕分辨率宽 g
+        public const string PARAM_WIDTH = "width";
+
+        // 物理设备真实屏幕分辨率高 g
+        public const string PARAM_HEIGHT = "height";
+
+        // 设备可用存储空间（磁盘），单位B d
+        public const string PARAM_ROM = "rom";
+
+        // 设备可用内存，单位B d
+        public const string PARAM_RAM = "ram";
+
+        // 设备总存储空间（磁盘），单位B g
+        public const string PARAM_TOTAL_ROM = "total_rom";
+
+        // 设备总内存，单位B g
+        public const string PARAM_TOTAL_RAM = "total_ram";
+
+        // 芯片型号，eg：Qualcomm Technologies, Inc SM7250 g
+        public const string PARAM_HARDWARE = "hardware";
+
+        // taptap的用户ID的外显ID（加密）d
+        public const string PARAM_OPEN_ID = "open_id";
+
+        // 网络类型，eg：wifi, mobile
+        public const string PARAM_NETWORK_TYPE = "network_type";
+
+        // SDK进程粒度的本地日志 session_id
+        public const string PARAM_P_SESSION_ID = "p_session_id";
+    }
+}

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

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cef15b6df966846ab9959061ba833aa9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,198 @@
+
+#if UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using TapSDK.Core.Internal.Log;
+using UnityEngine;
+using Newtonsoft.Json;
+using TapSDK.Core.Standalone.Internal.Openlog;
+using ProtoBuf;
+
+namespace TapSDK.Core.Standalone.Internal
+{
+    public abstract class TapOpenlogQueueBase
+    {
+        private TapLog log;
+        private string module;
+        private string persistentDataPath = Application.persistentDataPath;
+        private Queue<TapOpenlogStoreBean> queue = new Queue<TapOpenlogStoreBean>();
+        private TapOpenlogHttpClient httpClient = new TapOpenlogHttpClient();
+        private const int MaxEvents = 50;
+        private const int MaxBatchSize = 200;
+        private const float SendInterval = 15;
+        private Timer timer;
+        private int queueCount => queue.Count;
+
+        protected abstract string GetUrlPath();
+        protected abstract string GetEventFilePath();
+
+        public TapOpenlogQueueBase(string module)
+        {
+            this.module = module;
+            log = new TapLog(module: "Openlog." + module);
+            // 加载未发送的事件
+            LoadStorageLogs();
+            SendEventsAsync();
+        }
+
+        public void Enqueue(TapOpenlogStoreBean bean)
+        {
+            // 将事件添加到队列
+            queue.Enqueue(bean);
+            SaveEvents();
+
+            // 检查队列大小
+            if (queueCount >= MaxEvents)
+            {
+                log.Log("队列大小超过最大值 = " + queueCount);
+                SendEventsAsync();
+                log.Log("队列大小超过最大值 end");
+            }
+            else
+            {
+                ResetTimer();
+            }
+        }
+
+        public async void SendEventsAsync()
+        {
+            if (queueCount == 0)
+            {
+                return;
+            }
+            var eventsToSend = new List<TapOpenlogStoreBean>();
+            LogGroup logGroup = new LogGroup();
+            logGroup.Logs = new List<Log>();
+            for (int i = 0; i < MaxBatchSize && queueCount > 0; i++)
+            {
+                TapOpenlogStoreBean bean = queue.Dequeue();
+                eventsToSend.Add(bean);
+
+                Log log = new Log();
+                log.Time = (uint)(bean.timestamp / 1000);
+                log.Contents = new List<LogContent>();
+                foreach (var kvp in bean.props)
+                {
+                    LogContent logContent = new LogContent
+                    {
+                        Key = kvp.Key ?? "",
+                        Value = kvp.Value ?? ""
+                    };
+                    log.Contents.Add(logContent);
+                }
+                logGroup.Logs.Add(log);
+            }
+
+            byte[] bytes;
+            using (var stream = new MemoryStream())
+            {
+                Serializer.Serialize(stream, logGroup);
+                bytes = stream.ToArray();
+            }
+
+            var result = await httpClient.Post(GetUrlPath(), content: bytes);
+            if (!result)
+            {
+                foreach (var eventParams in eventsToSend)
+                {
+                    queue.Enqueue(eventParams);
+                }
+                SaveEvents();
+            }
+            else
+            {
+                log.Log("SendEvents success", JsonConvert.SerializeObject(logGroup));
+                SaveEvents();
+                if (queueCount > MaxEvents)
+                {
+                    SendEventsAsync();
+                }
+            }
+
+        }
+
+        private void OnTimerElapsed(object state)
+        {
+            timer.Dispose();
+            timer = null;
+            SendEventsAsync();
+        }
+
+        private void ResetTimer()
+        {
+            if (timer == null)
+            {
+                // 设置计时器，15秒后触发一次
+                timer = new Timer(OnTimerElapsed, null, TimeSpan.FromSeconds(SendInterval), Timeout.InfiniteTimeSpan);
+            }
+        }
+
+        private void LoadStorageLogs()
+        {
+            string filePath = Path.Combine(persistentDataPath, GetEventFilePath());
+            if (File.Exists(filePath))
+            {
+                string jsonData = File.ReadAllText(filePath);
+                if (string.IsNullOrEmpty(jsonData))
+                {
+                    return;
+                }
+                List<TapOpenlogStoreBean> deserializedData;
+                try
+                {
+                    deserializedData = JsonConvert.DeserializeObject<List<TapOpenlogStoreBean>>(jsonData);
+                }
+                catch (Exception ex)
+                {
+                    log.Warning($"LoadLogs( FileName : {GetEventFilePath()} ) Exception", ex.ToString());
+                    File.Delete(filePath);
+                    return;
+                }
+                if (deserializedData != null && deserializedData.Count > 0)
+                {
+                    foreach (var item in deserializedData)
+                    {
+                        queue.Enqueue(item);
+                    }
+                }
+            }
+            log.Log("LoadStorageLogs end, count = " + queue.Count, JsonConvert.SerializeObject(queue.ToList()));
+        }
+
+        private void SaveEvents()
+        {
+            try
+            {
+                if (queue == null)
+                {
+                    return;
+                }
+
+                var eventList = queue.ToList();
+                string jsonData = JsonConvert.SerializeObject(eventList);
+
+                if (string.IsNullOrEmpty(GetEventFilePath()))
+                {
+                    log.Log("EventFilePath is null or empty");
+                    return;
+                }
+
+                string filePath = Path.Combine(persistentDataPath, GetEventFilePath());
+                if (string.IsNullOrEmpty(filePath))
+                {
+                    return;
+                }
+
+                File.WriteAllText(filePath, jsonData);
+            }
+            catch (Exception ex)
+            {
+                log.Warning("SaveEvents Exception" + ex.Message);
+            }
+        }
+    }
+}
+#endif

package/Standalone/Runtime/Internal/Openlog/TapOpenlogQueueBase.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b41c2095375aa4c3bbb590c262e02f6a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,17 @@
+#if UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN
+namespace TapSDK.Core.Standalone.Internal
+{
+    public class TapOpenlogQueueBusiness : TapOpenlogQueueBase
+    {
+        private const string eventFilePath = "TapLogBusiness";
+        private const string urlPath = "putrecords/tds/tapsdk";
+
+        public TapOpenlogQueueBusiness() : base("Business")
+        {
+        }
+
+        protected override string GetEventFilePath() => eventFilePath;
+        protected override string GetUrlPath() => urlPath;
+    }
+}
+#endif

package/Standalone/Runtime/Internal/Openlog/TapOpenlogQueueBusiness.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6b7900e0a4c624edfabc2326bdbab953
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,15 @@
+#if UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN
+namespace TapSDK.Core.Standalone.Internal
+{
+    public class TapOpenlogQueueTechnology : TapOpenlogQueueBase
+    {
+        private const string eventFilePath = "TapLogTechnology";
+        private const string urlPath = "putrecords/tds/tapsdk-apm";
+        public TapOpenlogQueueTechnology() : base("Technology")
+        {
+        }
+        protected override string GetEventFilePath() => eventFilePath;
+        protected override string GetUrlPath() => urlPath;
+    }
+}
+#endif

package/Standalone/Runtime/Internal/Openlog/TapOpenlogQueueTechnology.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c07d949d79d7d4ec893e5bda5e4c141d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,190 @@
+
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using TapSDK.Core.Internal.Log;
+using UnityEngine;
+
+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;
+#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
+            InitGeneralParameter();
+        }
+
+        public TapOpenlogStandalone(string sdkProjectName, string sdkProjectVersion)
+        {
+            this.sdkProjectName = sdkProjectName;
+            this.sdkProjectVersion = sdkProjectVersion;
+        }
+
+        public void LogBusiness(
+            string action,
+            Dictionary<string, string> properties = null
+        )
+        {
+            long timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+            string tLogId = Guid.NewGuid().ToString();
+
+            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.");
+#endif
+        }
+
+        public void LogTechnology(
+            string action,
+            Dictionary<string, string> properties = null
+        )
+        {
+            long timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+            string tLogId = Guid.NewGuid().ToString();
+
+            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("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.");
+#endif
+        }
+
+        private static void InitGeneralParameter()
+        {
+            // 应用包名
+            generalParameter[TapOpenlogParamConstants.PARAM_APP_PACKAGE_NAME] = Application.identifier;
+            // 应用版本字符串
+            generalParameter[TapOpenlogParamConstants.PARAM_APP_VERSION] = Application.version;
+            // 应用版本（数字）
+            generalParameter[TapOpenlogParamConstants.PARAM_APP_VERSION_CODE] = Application.buildGUID.ToString();
+            // 固定一个枚举值: TapSDK
+            generalParameter[TapOpenlogParamConstants.PARAM_PN] = "TapSDK";
+            // SDK 产物类型
+            generalParameter[TapOpenlogParamConstants.PARAM_TAPSDK_ARTIFACT] = "Unity";
+            // SDK 运行平台
+            generalParameter[TapOpenlogParamConstants.PARAM_PLATFORM] = Application.platform.ToString();
+            // 埋点版本号（预留字段），当前全为1
+            generalParameter[TapOpenlogParamConstants.PARAM_TRACK_CODE] = "1";
+            // SDK生成的设备一次安装的唯一标识
+            generalParameter[TapOpenlogParamConstants.PARAM_INSTALL_UUID] = Identity.InstallationId;
+            // 设备品牌，eg: Xiaomi
+            generalParameter[TapOpenlogParamConstants.PARAM_DV] = "";
+            // 设备品牌型号，eg：21051182C
+            generalParameter[TapOpenlogParamConstants.PARAM_MD] = SystemInfo.deviceModel;
+            // 设备CPU型号，eg：arm64-v8a
+            generalParameter[TapOpenlogParamConstants.PARAM_CPU] = "";
+            // 支持 CPU 架构，eg：arm64-v8a
+            generalParameter[TapOpenlogParamConstants.PARAM_CPU_ABIS] = "";
+            // 设备操作系统
+            generalParameter[TapOpenlogParamConstants.PARAM_OS] = SystemInfo.operatingSystemFamily.ToString();
+            // 设备操作系统版本
+            generalParameter[TapOpenlogParamConstants.PARAM_SV] = SystemInfo.operatingSystem;
+            // 物理设备真实屏幕分辨率宽
+            generalParameter[TapOpenlogParamConstants.PARAM_WIDTH] = Screen.currentResolution.width.ToString();
+            // 物理设备真实屏幕分辨率高
+            generalParameter[TapOpenlogParamConstants.PARAM_HEIGHT] = Screen.currentResolution.height.ToString();
+            // 设备总存储空间（磁盘），单位B
+            generalParameter[TapOpenlogParamConstants.PARAM_TOTAL_ROM] = "";
+            // 设备总内存，单位B
+            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;
+                }
+            }
+        }
+
+        private void InflateDynamicProperties(Dictionary<string, string> props)
+        {
+
+            // 客户端时区，eg：Asia/Shanghai
+            props[TapOpenlogParamConstants.PARAM_TIMEZONE] = TimeZoneInfo.Local.Id;
+            // SDK接入项目具体模块枚举值
+            props[TapOpenlogParamConstants.PARAM_TAPSDK_PROJECT] = sdkProjectName;
+            // SDK 模块版本号
+            props[TapOpenlogParamConstants.PARAM_TAPSDK_VERSION] = sdkProjectVersion;
+            // SDK设置的地区，例如 zh_CN
+            props[TapOpenlogParamConstants.PARAM_SDK_LOCALE] = Tracker.getServerLanguage();
+            // 游戏账号 ID（非角色 ID）
+            props[TapOpenlogParamConstants.PARAM_GAME_USER_ID] = TapCoreStandalone.User.Id;
+            // 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] = "";
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8ca3a4d34396f4bd6946aa219459ad60
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Standalone/Runtime/Internal/Openlog.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 93aaba645bba840eb88fe51d138c10fb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Standalone/Runtime/Internal/Tracker.cs

@@ -187,7 +187,7 @@ namespace TapSDK.Core.Standalone.Internal {
             if (properties == null) {
                 properties = new Dictionary<string, object>();
             }
-            properties["sdk_version"] = TapTapSDK.SDKVersion;
+            properties["sdk_version"] = TapTapSDK.Version;
 
             Dictionary<string, object> data = new Dictionary<string, object>(basicProps) {
                 { "client_id", TapCoreStandalone.coreOptions.clientId },
@@ -216,7 +216,7 @@ namespace TapSDK.Core.Standalone.Internal {
                 { "height", Screen.currentResolution.height },
                 { "provider", "unknown" },
                 { "app_version", TapCoreStandalone.coreOptions.gameVersion ?? Application.version },
-                { "sdk_version", TapTapSDK.SDKVersion },
+                { "sdk_version", TapTapSDK.Version },
                 { "network_type", Network },
                 { "channel", TapCoreStandalone.coreOptions.channel },
                 { "mac_list", macList },

package/Standalone/Runtime/Internal/Utils/TapProtoBufffer.cs

@@ -0,0 +1,28 @@
+// #if UNITY_EDITOR || (!UNITY_ANDROID && !UNITY_IOS)
+// using Google.Protobuf;
+
+// namespace TapSDK.Core.Standalone.Internal.Utils
+// {
+
+//     public class TapProtoBufffer
+//     {
+//         public static byte[] Serialize(IMessage message)
+//         {
+//             return message.ToByteArray();
+//         }
+
+//         public static T DeSerialize<T>(byte[] packet) where T : IMessage, new()
+//         {
+//             IMessage message = new T();
+//             try
+//             {
+//                 return (T)message.Descriptor.Parser.ParseFrom(packet);
+//             }
+//             catch (System.Exception e)
+//             {
+//                 throw;
+//             }
+//         }
+//     }
+// }
+// #endif

package/Standalone/Runtime/Internal/Utils/TapProtoBufffer.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f7f3dd7d1657c46acb0a8bb6b62bfdf6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Standalone/Runtime/Internal/Utils.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 784d8481ab7574753a09c8c392b59d06
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Standalone/Runtime/Public/TapCoreStandalone.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using UnityEditor;
 using System.IO;
 using TapSDK.Core.Internal.Utils;
+using TapSDK.Core.Standalone.Internal.Openlog;
 
 namespace TapSDK.Core.Standalone
 {
@@ -79,6 +80,8 @@ namespace TapSDK.Core.Standalone
 
             Tracker.Init();
 
+            TapOpenlogStandalone.Init();
+
             requestClientSetting();
         }
 

package/link.xml

@@ -0,0 +1,4 @@
+<linker>
+  <assembly fullname="TapSDK.Core.Runtime" preserve="all" />
+  <assembly fullname="TapSDK.Core.Mobile.Runtime" preserve="all" />
+</linker>

package/link.xml.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 60e986f5fee4a4079a749392348873e5
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/package.json

@@ -2,7 +2,7 @@
   "name": "com.taptap.sdk.core",
   "displayName": "TapTapSDK Core",
   "description": "TapTapSDK Core",
-  "version": "4.3.4",
+  "version": "4.3.8-alpha.2",
   "unity": "2019.4",
   "license": "MIT",
   "dependencies": {