com.taptap.sdk.core 4.4.2 → 4.5.0

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,12 @@
     <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.5.0"/>
   </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.5.0" 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

@@ -8,10 +8,11 @@ using UnityEngine;
 using System.Reflection;
 using TapSDK.Core.Internal.Init;
 using TapSDK.Core.Internal.Log;
+using System.ComponentModel;
 
 namespace TapSDK.Core {
     public class TapTapSDK {
-        public static readonly string Version = "4.4.2";
+        public static readonly string Version = "4.5.0";
         
         public static string SDKPlatform = "TapSDK-Unity";
 
@@ -61,10 +62,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 +78,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/Constants.cs

@@ -15,23 +15,6 @@ namespace TapSDK.Core.Standalone.Internal {
 
         internal static string ClientSettingsFileName = "TapSDKClientSettings.json";
         internal static string ClientSettingsEventKey = "ClientSettingsEventKey";
-
-        public static string TAPSDK_HOST {
-            get {
-                if (TapCoreStandalone.isRnd) {
-                    if (TapCoreStandalone.coreOptions.region == TapTapRegionType.CN)
-                        return "https://tapsdk.api.xdrnd.cn";
-                    else
-                        return "https://tapsdk.api.xdrnd.com";
-                } else {
-                    if (TapCoreStandalone.coreOptions.region == TapTapRegionType.CN)
-                        return "https://tapsdk.tapapis.cn";
-                    else
-                        return "https://tapsdk.tapapis.com";
-                }
-            }
-        }
-
     }
 
 }

package/Standalone/Runtime/Internal/DeviceInfo.cs

@@ -1,27 +1,29 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Globalization;
-using System.Diagnostics;
-using System.Collections;
 using System.Collections.Generic;
 using System.Net.NetworkInformation;
 using UnityEngine;
+using System.Diagnostics;
 
-namespace TapSDK.Core.Standalone.Internal {
-    public class DeviceInfo {
+namespace TapSDK.Core.Standalone.Internal
+{
+  public class DeviceInfo
+  {
 
 #if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
-        [DllImport("TapDBDeviceInfo", CallingConvention = CallingConvention.Cdecl)]
-        private static extern IntPtr GetDeviceLanguage();
+    [DllImport("TapDBDeviceInfo", CallingConvention = CallingConvention.Cdecl)]
+    private static extern IntPtr GetDeviceLanguage();
 #endif
 
-        public static string GetLanguage() {
+    public static string GetLanguage()
+    {
 #if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
-            return Marshal.PtrToStringAnsi(GetDeviceLanguage());
+      return Marshal.PtrToStringAnsi(GetDeviceLanguage());
 #else
             return CultureInfo.CurrentUICulture.IetfLanguageTag;
 #endif
-        }
+    }
 
 #if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
         [DllImport("kernel32.dll")]
@@ -48,9 +50,9 @@ namespace TapSDK.Core.Standalone.Internal {
         }
 #endif
 
-        //安全组提供的设备识别 ID 算法，用于后续数据串联
-        public static string GetLaunchUniqueID() 
-        {
+    //安全组提供的设备识别 ID 算法，用于后续数据串联
+    public static string GetLaunchUniqueID()
+    {
 #if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
           // 获取当前进程对象
           Process currentProcess = Process.GetCurrentProcess();
@@ -58,95 +60,97 @@ namespace TapSDK.Core.Standalone.Internal {
           DateTime startTime = GetProcessStartTime();
           return toMd5(startTime.ToFileTime().ToString() + "-" + currentProcess.Id.ToString());
 #else
-          return "";
+      return "";
 #endif
 
-        }
+    }
 
-        public static void GetMacAddress(out string macAddressList, out string firstMacAddress)
-        {
-          List<string> mac_addrs = new List<string>();
-
-          try
-          {
-            NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces();
-            foreach (NetworkInterface adapter in nics)
-            {
-              string physicalAddress = adapter.GetPhysicalAddress().ToString();
-              if (string.IsNullOrEmpty(physicalAddress))
-                continue;
-
-              physicalAddress = $"\"{physicalAddress}\"";
-              if (mac_addrs.IndexOf(physicalAddress) == -1)
-                mac_addrs.Add(physicalAddress);
-            }
-            // sort
-            mac_addrs.Sort();
-          }
-          catch (Exception e)
-          {
-            UnityEngine.Debug.Log("GetMacAddress Exception " + e.Message);
-          }
-          macAddressList = $"[{string.Join(",", mac_addrs)}]";
-          firstMacAddress = mac_addrs.Count > 0 ? mac_addrs[0].Replace("\"", "") : string.Empty;
-        }
+    public static void GetMacAddress(out string macAddressList, out string firstMacAddress)
+    {
+      List<string> mac_addrs = new List<string>();
 
-        private static string toMd5(string data)
+      try
+      {
+        NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces();
+        foreach (NetworkInterface adapter in nics)
         {
-          byte[] buffer = System.Text.Encoding.Default.GetBytes(data);
-          try
-          {
-            System.Security.Cryptography.MD5CryptoServiceProvider chk = new System.Security.Cryptography.MD5CryptoServiceProvider();
-            byte[] some = chk.ComputeHash(buffer);
-            string ret = "";
-            foreach(byte a in some)
-            {
-                if (a < 16)
-                    ret += "0" + a.ToString("X");
-                else
-                    ret += a.ToString("X");                    
-            }
-            return ret.ToLower();
-          }
-          catch
-          {
-              throw;
-            }
+          string physicalAddress = adapter.GetPhysicalAddress().ToString();
+          if (string.IsNullOrEmpty(physicalAddress))
+            continue;
+
+          physicalAddress = $"\"{physicalAddress}\"";
+          if (mac_addrs.IndexOf(physicalAddress) == -1)
+            mac_addrs.Add(physicalAddress);
         }
+        // sort
+        mac_addrs.Sort();
+      }
+      catch (Exception e)
+      {
+        UnityEngine.Debug.Log("GetMacAddress Exception " + e.Message);
+      }
+      macAddressList = $"[{string.Join(",", mac_addrs)}]";
+      firstMacAddress = mac_addrs.Count > 0 ? mac_addrs[0].Replace("\"", "") : string.Empty;
+    }
 
-        public static string RAM
+    private static string toMd5(string data)
+    {
+      byte[] buffer = System.Text.Encoding.Default.GetBytes(data);
+      try
+      {
+        System.Security.Cryptography.MD5CryptoServiceProvider chk = new System.Security.Cryptography.MD5CryptoServiceProvider();
+        byte[] some = chk.ComputeHash(buffer);
+        string ret = "";
+        foreach (byte a in some)
         {
-          get {
-            return (SystemInfo.systemMemorySize * 1024L * 1024L).ToString();
-          }
+          if (a < 16)
+            ret += "0" + a.ToString("X");
+          else
+            ret += a.ToString("X");
         }
-        
-        // 获取系统的 ROM 存储容量，单位为 Byte
-        public static string ROM
+        return ret.ToLower();
+      }
+      catch
+      {
+        throw;
+      }
+    }
+
+    public static string RAM
+    {
+      get
+      {
+        return (SystemInfo.systemMemorySize * 1024L * 1024L).ToString();
+      }
+    }
+
+    // 获取系统的 ROM 存储容量，单位为 Byte
+    public static string ROM
+    {
+      get
+      {
+        string path = Application.persistentDataPath;
+        if (string.IsNullOrEmpty(path))
+          return "0";
+
+        try
         {
-          get {
-            string path = Application.persistentDataPath;
-            if (string.IsNullOrEmpty(path))
-              return "0";
-
-            try
-            {
-              System.IO.DriveInfo drive = new System.IO.DriveInfo(path);
-              return drive.TotalSize.ToString();
-            }
-            catch (Exception e)
-            {
-              UnityEngine.Debug.Log("GetROMInByte Exception " + e.Message);
-              return "0";
-            }
-          }
+          System.IO.DriveInfo drive = new System.IO.DriveInfo(path);
+          return drive.TotalSize.ToString();
         }
-      
-        public static string Local
+        catch (Exception)
         {
-          get {
-            return CultureInfo.CurrentCulture.Name.Replace('-', '_');
-          }
+          return "0";
         }
+      }
+    }
+
+    public static string Local
+    {
+      get
+      {
+        return CultureInfo.CurrentCulture.Name.Replace('-', '_');
+      }
     }
+  }
 }

package/Standalone/Runtime/Internal/EventSender.cs

@@ -14,7 +14,7 @@ using UnityEngine.Networking;
 
 namespace TapSDK.Core.Standalone.Internal
 {
-    public class EventSender : MonoBehaviour
+    public class EventSender
     {
         private const string EventFilePath = "events.json";
 
@@ -86,7 +86,7 @@ namespace TapSDK.Core.Standalone.Internal
             var resonse = await tapHttp.PostJsonAsync<Boolean>(path: $"{domain}/v2/batch", json: body);
             if (resonse.IsSuccess)
             {
-                log.Log("Events sent successfully");
+                // log.Log("Events sent successfully");
             }
             else
             {