com.taptap.sdk.core 4.8.4-beta.1 → 4.8.4-beta.2

package/Mobile/Editor/NativeDependencies.xml

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <dependencies>
   <androidPackages>
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.8.4"/>
+    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.8.4" />
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
-    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapSDK/Core" version="4.8.4"/>
+    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapSDK/Core" version="4.8.4" />
   </iosPods>
 </dependencies>

package/Mobile/Editor/TapCommonMobileProcessBuild.cs

@@ -1,20 +1,20 @@
-using System;
-using UnityEditor.Build.Reporting;
-using TapSDK.Core.Editor;
-
-namespace TapSDK.Core.Mobile.Editor {
-    public class TapCommonMobileProcessBuild : SDKLinkProcessBuild {
-        public override int callbackOrder => 0;
-
-        public override string LinkPath => "TapSDK/Core/link.xml";
-
-        public override LinkedAssembly[] LinkedAssemblies => new LinkedAssembly[] {
-                    new LinkedAssembly { Fullname = "TapSDK.Core.Runtime" },
-                    new LinkedAssembly { Fullname = "TapSDK.Core.Mobile.Runtime" }
-                };
-
-        public override Func<BuildReport, bool> IsTargetPlatform => (report) => {
-            return BuildTargetUtils.IsSupportMobile(report.summary.platform);
-        };
-    }
-}
+using System;
+using UnityEditor.Build.Reporting;
+using TapSDK.Core.Editor;
+
+namespace TapSDK.Core.Mobile.Editor {
+    public class TapCommonMobileProcessBuild : SDKLinkProcessBuild {
+        public override int callbackOrder => 0;
+
+        public override string LinkPath => "TapSDK/Core/link.xml";
+
+        public override LinkedAssembly[] LinkedAssemblies => new LinkedAssembly[] {
+                    new LinkedAssembly { Fullname = "TapSDK.Core.Runtime" },
+                    new LinkedAssembly { Fullname = "TapSDK.Core.Mobile.Runtime" }
+                };
+
+        public override Func<BuildReport, bool> IsTargetPlatform => (report) => {
+            return BuildTargetUtils.IsSupportMobile(report.summary.platform);
+        };
+    }
+}

package/Runtime/Internal/Utils/UrlUtils.cs

@@ -1,34 +1,34 @@
-using System;
-using System.Linq;
-using System.Collections.Specialized;
-
-namespace TapSDK.Core.Internal.Utils {
-    public class UrlUtils {
-        public static NameValueCollection ParseQueryString(string query) { 
-            NameValueCollection nvc = new NameValueCollection();
-
-            if (query.StartsWith("?")) {
-                query = query.Substring(1);
-            }
-
-            foreach (var param in query.Split('&')) {
-                string[] pair = param.Split('=');
-                if (pair.Length == 2) {
-                    string key = Uri.UnescapeDataString(pair[0]);
-                    string value = Uri.UnescapeDataString(pair[1]);
-                    nvc[key] = value;
-                }
-            }
-
-            return nvc;
-        }
-
-        public static string ToQueryString(NameValueCollection nvc) {
-            var array = (from key in nvc.AllKeys
-                        from value in nvc.GetValues(key)
-                        select $"{Uri.EscapeDataString(key)}={Uri.EscapeDataString(value)}"
-                        ).ToArray();
-            return string.Join("&", array);
-        }
-    }
+using System;
+using System.Linq;
+using System.Collections.Specialized;
+
+namespace TapSDK.Core.Internal.Utils {
+    public class UrlUtils {
+        public static NameValueCollection ParseQueryString(string query) { 
+            NameValueCollection nvc = new NameValueCollection();
+
+            if (query.StartsWith("?")) {
+                query = query.Substring(1);
+            }
+
+            foreach (var param in query.Split('&')) {
+                string[] pair = param.Split('=');
+                if (pair.Length == 2) {
+                    string key = Uri.UnescapeDataString(pair[0]);
+                    string value = Uri.UnescapeDataString(pair[1]);
+                    nvc[key] = value;
+                }
+            }
+
+            return nvc;
+        }
+
+        public static string ToQueryString(NameValueCollection nvc) {
+            var array = (from key in nvc.AllKeys
+                        from value in nvc.GetValues(key)
+                        select $"{Uri.EscapeDataString(key)}={Uri.EscapeDataString(value)}"
+                        ).ToArray();
+            return string.Join("&", array);
+        }
+    }
 }

package/Runtime/Public/TapTapSDK.cs

@@ -12,7 +12,7 @@ using System.ComponentModel;
 
 namespace TapSDK.Core {
     public class TapTapSDK {
-        public static readonly string Version = "4.8.4-beta.1";
+        public static readonly string Version = "4.8.4";
         
         public static string SDKPlatform = "TapSDK-Unity";
 

package/Runtime/TapSDK.Core.Runtime.asmdef

@@ -1,3 +1,3 @@
-{
-	"name": "TapSDK.Core.Runtime"
-}
+{
+	"name": "TapSDK.Core.Runtime"
+}

package/Standalone/Editor/TapCoreStandaloneProcessBuild.cs

@@ -1,20 +1,20 @@
-using System;
-using UnityEditor.Build.Reporting;
-using TapSDK.Core.Editor;
-
-namespace TapSDK.Core.Editor {
-    public class TapCoreStandaloneProcessBuild : SDKLinkProcessBuild {
-        public override int callbackOrder => 0;
-
-        public override string LinkPath => "TapSDK/Core/link.xml";
-
-        public override LinkedAssembly[] LinkedAssemblies => new LinkedAssembly[] {
-                    new LinkedAssembly { Fullname = "TapSDK.Core.Runtime" },
-                    new LinkedAssembly { Fullname = "TapSDK.Core.Standalone.Runtime" }
-                };
-
-        public override Func<BuildReport, bool> IsTargetPlatform => (report) => {
-            return BuildTargetUtils.IsSupportStandalone(report.summary.platform);
-        };
-    }
+using System;
+using UnityEditor.Build.Reporting;
+using TapSDK.Core.Editor;
+
+namespace TapSDK.Core.Editor {
+    public class TapCoreStandaloneProcessBuild : SDKLinkProcessBuild {
+        public override int callbackOrder => 0;
+
+        public override string LinkPath => "TapSDK/Core/link.xml";
+
+        public override LinkedAssembly[] LinkedAssemblies => new LinkedAssembly[] {
+                    new LinkedAssembly { Fullname = "TapSDK.Core.Runtime" },
+                    new LinkedAssembly { Fullname = "TapSDK.Core.Standalone.Runtime" }
+                };
+
+        public override Func<BuildReport, bool> IsTargetPlatform => (report) => {
+            return BuildTargetUtils.IsSupportStandalone(report.summary.platform);
+        };
+    }
 }

package/Standalone/Runtime/Internal/DeviceInfo.cs

@@ -1,137 +1,137 @@
-using System;
-using System.Runtime.InteropServices;
-using System.Globalization;
-using System.Collections.Generic;
-using System.Net.NetworkInformation;
-using UnityEngine;
-using System.Diagnostics;
-using TapSDK.Core.Internal.Log;
-
-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();
-#endif
-
-    public static string GetLanguage()
-    {
-#if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
-      return Marshal.PtrToStringAnsi(GetDeviceLanguage());
-#else
-            return CultureInfo.CurrentUICulture.IetfLanguageTag;
-#endif
-    }
-
-#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
-        [DllImport("kernel32.dll")]
-        static extern IntPtr GetCurrentProcess();
-
-        [DllImport("kernel32.dll")]
-        static extern uint GetProcessTimes(IntPtr processHandle,
-            out long creationTime,
-            out long exitTime,
-            out long kernelTime,
-            out long userTime);
-
-        static DateTime GetProcessStartTime()
-        {
-            IntPtr processHandle = GetCurrentProcess();
-            long creationTime;
-            GetProcessTimes(processHandle,
-                out creationTime,
-                out _,
-                out _,
-                out _);
-
-            return DateTime.FromFileTime(creationTime);
-        }
-#endif
-
-    //安全组提供的设备识别 ID 算法，用于后续数据串联
-    public static string GetLaunchUniqueID()
-    {
-#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
-          // 获取当前进程对象
-          Process currentProcess = Process.GetCurrentProcess();
-          // 获取进程启动时间
-          DateTime startTime = GetProcessStartTime();
-          return toMd5(startTime.ToFileTime().ToString() + "-" + currentProcess.Id.ToString());
-#else
-      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)
-      {
-        TapLog.Log("GetMacAddress Exception " + e.Message);
-      }
-      macAddressList = $"[{string.Join(",", mac_addrs)}]";
-      firstMacAddress = mac_addrs.Count > 0 ? mac_addrs[0].Replace("\"", "") : string.Empty;
-    }
-
-    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)
-        {
-          if (a < 16)
-            ret += "0" + a.ToString("X");
-          else
-            ret += a.ToString("X");
-        }
-        return ret.ToLower();
-      }
-      catch
-      {
-        throw;
-      }
-    }
-
-    public static string RAM
-    {
-      get
-      {
-        return (SystemInfo.systemMemorySize * 1024L * 1024L).ToString();
-      }
-    }
-
-
-    public static string Local
-    {
-      get
-      {
-        return CultureInfo.CurrentCulture.Name.Replace('-', '_');
-      }
-    }
-  }
+using System;
+using System.Runtime.InteropServices;
+using System.Globalization;
+using System.Collections.Generic;
+using System.Net.NetworkInformation;
+using UnityEngine;
+using System.Diagnostics;
+using TapSDK.Core.Internal.Log;
+
+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();
+#endif
+
+    public static string GetLanguage()
+    {
+#if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
+      return Marshal.PtrToStringAnsi(GetDeviceLanguage());
+#else
+            return CultureInfo.CurrentUICulture.IetfLanguageTag;
+#endif
+    }
+
+#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
+        [DllImport("kernel32.dll")]
+        static extern IntPtr GetCurrentProcess();
+
+        [DllImport("kernel32.dll")]
+        static extern uint GetProcessTimes(IntPtr processHandle,
+            out long creationTime,
+            out long exitTime,
+            out long kernelTime,
+            out long userTime);
+
+        static DateTime GetProcessStartTime()
+        {
+            IntPtr processHandle = GetCurrentProcess();
+            long creationTime;
+            GetProcessTimes(processHandle,
+                out creationTime,
+                out _,
+                out _,
+                out _);
+
+            return DateTime.FromFileTime(creationTime);
+        }
+#endif
+
+    //安全组提供的设备识别 ID 算法，用于后续数据串联
+    public static string GetLaunchUniqueID()
+    {
+#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
+          // 获取当前进程对象
+          Process currentProcess = Process.GetCurrentProcess();
+          // 获取进程启动时间
+          DateTime startTime = GetProcessStartTime();
+          return toMd5(startTime.ToFileTime().ToString() + "-" + currentProcess.Id.ToString());
+#else
+      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)
+      {
+        TapLog.Log("GetMacAddress Exception " + e.Message);
+      }
+      macAddressList = $"[{string.Join(",", mac_addrs)}]";
+      firstMacAddress = mac_addrs.Count > 0 ? mac_addrs[0].Replace("\"", "") : string.Empty;
+    }
+
+    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)
+        {
+          if (a < 16)
+            ret += "0" + a.ToString("X");
+          else
+            ret += a.ToString("X");
+        }
+        return ret.ToLower();
+      }
+      catch
+      {
+        throw;
+      }
+    }
+
+    public static string RAM
+    {
+      get
+      {
+        return (SystemInfo.systemMemorySize * 1024L * 1024L).ToString();
+      }
+    }
+
+
+    public static string Local
+    {
+      get
+      {
+        return CultureInfo.CurrentCulture.Name.Replace('-', '_');
+      }
+    }
+  }
 }

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

@@ -10,6 +10,8 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
         internal const string DllName = "tapsdkcore";
 #elif UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
         internal const string DllName = "libtapsdkcorecpp";
+#elif UNITY_STANDALONE_LINUX || UNITY_EDITOR_LINUX
+        internal const string DllName = "libtapsdkcorecpp";
 #endif
 
         /**

package/Standalone/Runtime/TapSDK.Core.Standalone.Runtime.asmdef

@@ -14,7 +14,6 @@
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": [],
     "versionDefines": [],
     "noEngineReferences": false
 }

package/package.json

@@ -1,11 +1,8 @@
 {
-    "name": "com.taptap.sdk.core",
-    "displayName": "TapTapSDK Core",
-    "description": "TapTapSDK Core",
-    "version": "4.8.4-beta.1",
-    "unity": "2019.4",
-    "license": "MIT",
-    "dependencies": {
-        "com.google.external-dependency-manager": "1.2.179"
-    }
+  "name": "com.taptap.sdk.core",
+  "displayName": "TapTapSDK Core",
+  "description": "TapTapSDK Core",
+  "version": "4.8.4-beta.2",
+  "unity": "2020.3.0f1",
+  "license": "MIT"
 }