com.taptap.sdk.core 4.4.3 → 4.5.0

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.3"/>
+    <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.3" bitcodeEnabled="false" addToAllTargets="false"/>
+    <iosPod name="TapTapCoreSDK" version="~> 4.5.0" bitcodeEnabled="false" addToAllTargets="false"/>
   </iosPods>
 </dependencies>

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.3";
+        public static readonly string Version = "4.5.0";
         
         public static string SDKPlatform = "TapSDK-Unity";
 

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
             {

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

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

@@ -14,7 +14,7 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
         public static void Enable()
         {
 #if UNITY_STANDALONE
-            log.Log("Enable");
+            // log.Log("Enable");
             List<string> modules = new List<string> { MODULE_NAME };
             TapOpenlogWrapper.TdkEnableModules(JsonConvert.SerializeObject(modules));
 #endif
@@ -23,7 +23,7 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
         public static void Disable()
         {
 #if UNITY_STANDALONE
-            log.Log("Disable");
+            // log.Log("Disable");
             List<string> modules = new List<string> { MODULE_NAME };
             TapOpenlogWrapper.TdkDisableModules(JsonConvert.SerializeObject(modules));
 #endif

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

@@ -1,4 +1,3 @@
-
 using System;
 using System.Collections.Generic;
 using System.IO;

package/Standalone/Runtime/Public/TapCoreStandalone.cs

@@ -22,7 +22,6 @@ namespace TapSDK.Core.Standalone
         internal static Tracker Tracker;
         internal static User User;
         internal static TapTapSdkOptions coreOptions;
-        public static bool isRnd = false;
         internal static bool enableAutoEvent = true;
 
         internal static TapGatekeeper gatekeeperData = new TapGatekeeper();
@@ -41,12 +40,6 @@ namespace TapSDK.Core.Standalone
             TapLoom.Initialize();
         }
 
-        private static void SetRND(bool isRnd)
-        {
-            TapLog.Log("SetRND called = " + isRnd);
-            TapCoreStandalone.isRnd = isRnd;
-        }
-
         /// <summary>
         /// Initializes the TapCore SDK with the specified options.
         /// </summary>
@@ -72,7 +65,7 @@ namespace TapSDK.Core.Standalone
             if (File.Exists(path))
             {
                 var clientSettings = File.ReadAllText(path);
-                TapLog.Log("本地 clientSettings: " + clientSettings);
+                // TapLog.Log("本地 clientSettings: " + clientSettings);
                 try
                 {
                     TapGatekeeper tapGatekeeper = JsonConvert.DeserializeObject<TapGatekeeper>(clientSettings);
@@ -177,7 +170,6 @@ namespace TapSDK.Core.Standalone
         private void saveClientSettings(TapGatekeeper settings)
         {
             string json = JsonConvert.SerializeObject(settings);
-            Debug.Log("saveClientSettings: " + json);
             File.WriteAllText(Path.Combine(Application.persistentDataPath, Constants.ClientSettingsFileName), json);
         }
 
@@ -191,7 +183,6 @@ namespace TapSDK.Core.Standalone
                     enableAutoEvent = switchData.AutoEvent;
                 }
             }
-            Debug.Log("SetAutoEvent enableAutoEvent is: " + enableAutoEvent);
         }
     }
 

package/package.json

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