com.taptap.sdk.core 4.4.2 → 4.4.3

package/Editor/TapSDKCoreCompile.cs

@@ -17,11 +17,13 @@ namespace TapSDK.Core.Editor
 #if UNITY_IOS
         public static string GetProjPath(string path)
         {
+            Debug.Log($"SDX , GetProjPath path:{path}");
             return PBXProject.GetPBXProjectPath(path);
         }
 
         public static PBXProject ParseProjPath(string path)
         {
+            Debug.Log($"SDX , ParseProjPath path:{path}");
             var proj = new PBXProject();
             proj.ReadFromString(File.ReadAllText(path));
             return proj;
@@ -30,9 +32,11 @@ namespace TapSDK.Core.Editor
         public static string GetUnityFrameworkTarget(PBXProject proj)
         {
 #if UNITY_2019_3_OR_NEWER
+            Debug.Log("SDX , GetUnityFrameworkTarget UNITY_2019_3_OR_NEWER");
             string target = proj.GetUnityFrameworkTargetGuid();
             return target;
 #endif
+            Debug.Log("SDX , GetUnityFrameworkTarget");
             var unityPhoneTarget = proj.TargetGuidByName("Unity-iPhone");
             return unityPhoneTarget;
         }
@@ -40,9 +44,11 @@ namespace TapSDK.Core.Editor
         public static string GetUnityTarget(PBXProject proj)
         {
 #if UNITY_2019_3_OR_NEWER
+            Debug.Log("SDX , GetUnityTarget UNITY_2019_3_OR_NEWER");
             string target = proj.GetUnityMainTargetGuid();
             return target;
 #endif
+            Debug.Log("SDX , GetUnityTarget");
             var unityPhoneTarget = proj.TargetGuidByName("Unity-iPhone");
             return unityPhoneTarget;
         }

package/Mobile/Editor/NativeDependencies.xml

@@ -4,13 +4,13 @@
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.4.2"/>
+    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.4.3"/>
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
     <iosPod name="Protobuf" version="~> 3.0" bitcodeEnabled="false" addToAllTargets="false"/>
-    <iosPod name="TapTapCoreSDK" version="~> 4.4.0" bitcodeEnabled="false" addToAllTargets="false"/>
+    <iosPod name="TapTapCoreSDK" version="~> 4.4.3" bitcodeEnabled="false" addToAllTargets="false"/>
   </iosPods>
 </dependencies>

package/Mobile/Runtime/TapEventMobile.cs

@@ -87,7 +87,6 @@ namespace TapSDK.Core.Mobile
                 .Method("deviceUpdate")
                 .Args("deviceUpdate", properties)
                 .CommandBuilder());
-            IOSNativeWrapper.DeviceUpdate(properties);
 #else
             Bridge.CallHandler(EngineBridgeInitializer.GetBridgeServer()
                 .Method("deviceUpdate")

package/{Standalone/Runtime/Internal/Openlog/Bean.meta → Plugins.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7e49d7f2e1e5b4eaf90b7cf14770d8f8
+guid: 9b372fd6a570748ddbf4c96d16ebbc2b
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

package/Resources/TapMessage.prefab

@@ -58,7 +58,7 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 32767
   m_TargetDisplay: 0
 --- !u!114 &114668005265195872
 MonoBehaviour:

package/Runtime/Internal/Log/TapLog.cs

@@ -93,7 +93,7 @@ namespace TapSDK.Core.Internal.Log
         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}";
+            string threadInfo = isMainThread ? "Main" : $"IO {System.Threading.Thread.CurrentThread.ManagedThreadId}";
 
             if (IsMobilePlatform())
             {

package/Runtime/Public/TapTapSDK.cs

@@ -11,7 +11,7 @@ using TapSDK.Core.Internal.Log;
 
 namespace TapSDK.Core {
     public class TapTapSDK {
-        public static readonly string Version = "4.4.2";
+        public static readonly string Version = "4.4.3";
         
         public static string SDKPlatform = "TapSDK-Unity";
 
@@ -61,10 +61,13 @@ namespace TapSDK.Core {
                 throw new ArgumentException("[TapSDK] options is null!");
             if (string.IsNullOrEmpty(coreOption.clientId))
                 throw new ArgumentException("[TapSDK] clientID is null or empty!");
-
+            long startTime = DateTime.Now.Ticks;
             TapTapSDK.taptapSdkOptions = coreOption;
             TapLog.Enabled = coreOption.enableLog;
+            long startCore = DateTime.Now.Ticks;
             platformWrapper?.Init(coreOption,otherOptions);
+            long costCore = DateTime.Now.Ticks - startCore;
+            // TapLog.Log($"Init core cost time: {costCore / 10000}ms");
 
             Type[] initTaskTypes = GetInitTypeList();
             if (initTaskTypes != null) {
@@ -74,10 +77,15 @@ namespace TapSDK.Core {
                 }
                 initTasks = initTasks.OrderBy(task => task.Order).ToList();
                 foreach (IInitTask task in initTasks) {
-                    TapLogger.Debug($"Init: {task.GetType().Name}");
+                    TapLog.Log($"Init: {task.GetType().Name}");
+                    long startModule = DateTime.Now.Ticks;
                     task.Init(coreOption,otherOptions);
+                    long costModule = DateTime.Now.Ticks - startModule;
+                    // TapLog.Log($"Init {task.GetType().Name} cost time: {costModule / 10000}ms");
                 }
             }
+            long costTime = DateTime.Now.Ticks - startTime;
+            // TapLog.Log($"Init cost time: {costTime / 10000}ms");
         }
 
         // UpdateLanguage 方法

package/Runtime/Public/TapTapSdkOptions.cs

@@ -6,8 +6,6 @@ namespace TapSDK.Core
     public interface TapTapSdkBaseOptions
     {
         string moduleName { get; }
-
-        AndroidJavaObject androidObject{get;}
     }
 
     public enum TapTapRegionType
@@ -98,7 +96,5 @@ namespace TapSDK.Core
         {
             get => _moduleName;
         }
-
-        public AndroidJavaObject androidObject => throw new System.NotImplementedException();
     }
 }

package/Standalone/Plugins/macOS/libtapsdkcorecpp.dylib.meta

@@ -0,0 +1,80 @@
+fileFormatVersion: 2
+guid: 49c295e8cfb414b76aa3bdc07368e922
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 0
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 0
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: OSX
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        AddToEmbeddedBinaries: false
+        CPU: AnyCPU
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Standalone/Plugins/x86/tapsdkcore.dll.meta

@@ -0,0 +1,63 @@
+fileFormatVersion: 2
+guid: 5bfe079fe35ffa74f814bfa7df1d75f8
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Editor: 0
+        Exclude Linux64: 0
+        Exclude OSXUniversal: 0
+        Exclude Win: 0
+        Exclude Win64: 0
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        CPU: x86
+        DefaultValueInitialized: true
+        OS: Windows
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 1
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 1
+      settings:
+        CPU: None
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Standalone/{Runtime/Internal/Utils.meta → Plugins/x86.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 784d8481ab7574753a09c8c392b59d06
+guid: 9b86a68828e7ee54f95d29d7d9a077fd
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

package/Standalone/Plugins/x86_64/tapsdkcore.dll.meta

@@ -0,0 +1,63 @@
+fileFormatVersion: 2
+guid: f426835f028130348aec138e80a35b77
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Editor: 0
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 0
+        Exclude Win64: 0
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        CPU: x86_64
+        DefaultValueInitialized: true
+        OS: Windows
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win
+    second:
+      enabled: 1
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 1
+      settings:
+        CPU: x86_64
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/{link.xml.meta → Standalone/Plugins/x86_64.meta}

@@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: ef7292ae11c174302b02e26403a50f1b
-TextScriptImporter:
+guid: a7af5496cfd95834aa62ec556b3dfd83
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

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

@@ -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";