com.taptap.sdk.core 4.5.2 → 4.5.3

package/Mobile/Editor/NativeDependencies.xml

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

package/Runtime/Public/TapTapSDK.cs

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

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

@@ -4,7 +4,9 @@ namespace TapSDK.Core.Standalone.Internal.Http
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
     using System.Net.Http.Headers;
+    using System.Net.NetworkInformation;
     using System.Text;
     using System.Threading.Tasks;
     using Newtonsoft.Json;
@@ -24,7 +26,10 @@ namespace TapSDK.Core.Standalone.Internal.Http
         public static readonly string HOST_CN = "https://tapsdk.tapapis.cn";
         public static readonly string HOST_IO = "https://tapsdk.tapapis.com";
 
-        private static HttpClient client = new HttpClient();
+        private static HttpClient client = new HttpClient{
+            // 默认超时 10 秒
+            Timeout = TimeSpan.FromMilliseconds(CONNECT_TIMEOUT_MILLIS)
+        };
 
         private readonly TapHttpConfig httpConfig;
 
@@ -242,6 +247,11 @@ namespace TapSDK.Core.Standalone.Internal.Http
             object body = null
         )
         {
+            if(!CheckNetworkConnection()){
+                return TapHttpResult<T>.NetworkError(new TapHttpNetworkErrorException("network error"));
+            }else{
+                TapLog.Log("current network is connected");
+            }
             // 处理查询参数 
             Dictionary<string, string> allQueryParams = new Dictionary<string, string>();
             if (queryParams != null)
@@ -379,5 +389,49 @@ namespace TapSDK.Core.Standalone.Internal.Http
                 return TapHttpResult<T>.UnknownFailure(new TapHttpUnknownException(ex));
             }
         }
+
+        // 判断网络连接状态
+        private bool CheckNetworkConnection(){
+            try {
+                var networkInterfaces = NetworkInterface.GetAllNetworkInterfaces();
+
+                foreach (var netInterface in networkInterfaces)
+                {
+                    // 忽略虚拟网卡
+                    if (netInterface.NetworkInterfaceType == NetworkInterfaceType.Loopback || 
+                        netInterface.NetworkInterfaceType == NetworkInterfaceType.Tunnel)
+                    {
+                        continue;
+                    }
+
+                    // 检查是否有网络连接
+                    if (netInterface.OperationalStatus == OperationalStatus.Up)
+                    {
+                        // 检查是否有有效的 IPv4 地址
+                        var ipProperties = netInterface.GetIPProperties();
+                        var ipv4Address = ipProperties.UnicastAddresses.FirstOrDefault(ip => ip.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork);
+
+                        if (ipv4Address != null)
+                        {
+                            // 有有效的 IP 地址，则说明已连接到网络
+                            if (netInterface.NetworkInterfaceType == NetworkInterfaceType.Ethernet)
+                            {
+                                return true; // 有线连接
+                            }
+                            else if (netInterface.NetworkInterfaceType == NetworkInterfaceType.Wireless80211)
+                            {
+                                return true; // 无线连接
+                            }
+                        }
+                    }
+                }
+
+                return false; // 无连接
+            }catch(Exception e){
+                TapLog.Log("checkout network connected error = " + e);
+                // 发生异常时，当做有网处理
+                return true;
+            }
+        }
     }
 }

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

@@ -21,6 +21,14 @@ namespace TapSDK.Core.Standalone.Internal.Http
         }
     }
 
+    public class TapHttpNetworkErrorException : AbsTapHttpException
+    {
+        public TapHttpNetworkErrorException(string msg) : base("network error")
+        {
+            
+        }
+    }
+
     public class TapHttpInvalidResponseException : AbsTapHttpException
     {
         public HttpStatusCode StatusCode { get; }

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

@@ -84,6 +84,10 @@ namespace TapSDK.Core.Standalone.Internal.Http
                 try
                 {
                     httpResponse = JsonConvert.DeserializeObject<TapHttpResponse>(content);
+                    // 设置当前服务端返回的事件戳
+                    if (httpResponse.Now > 0){
+                        TapHttpTime.ResetLastServerTime(httpResponse.Now);
+                    }
                 }
                 catch (Exception)
                 {
@@ -119,12 +123,12 @@ namespace TapSDK.Core.Standalone.Internal.Http
                 }
                 else
                 {
-                    TapHttpErrorData httpErrorData = httpResponse.Data.ToObject<TapHttpErrorData>();
+                    TapHttpErrorData httpErrorData = httpResponse.Data?.ToObject<TapHttpErrorData>();
                     if (httpErrorData == null)
                     {
                         return TapHttpResult<T>.InvalidResponseFailure(new TapHttpInvalidResponseException(statusCode, "TapHttpErrorData is null"));
                     }
-                    return TapHttpResult<T>.ServerFailure(new TapHttpServerException((HttpStatusCode)500, httpResponse, httpErrorData));
+                    return TapHttpResult<T>.ServerFailure(new TapHttpServerException((HttpStatusCode)statusCode, httpResponse, httpErrorData));
                 }
             }
         }

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

@@ -86,5 +86,14 @@ namespace TapSDK.Core.Standalone.Internal.Http
             };
         }
 
+        public static TapHttpResult<T> NetworkError(TapHttpNetworkErrorException httpException)
+        {
+            return new TapHttpResult<T>
+            {
+                IsSuccess = false,
+                HttpException = httpException,
+            };
+        }
+
     }
 }

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

@@ -32,6 +32,28 @@ namespace TapSDK.Core.Standalone.Internal.Http
             }
             SetTimeOffset(time - (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds);
         }
+
+
+        // 服务端同步的时间戳
+        private static long LastServerTime = 0;
+        // 设置服务端时间时，当前应用启动时间
+        private static long LastStartUpTime = 0 ;
+        internal static void ResetLastServerTime(long time){
+            LastServerTime = time;
+            LastStartUpTime =  (long) Time.realtimeSinceStartup;
+        }
+
+        /// <summary>
+        /// 根据服务端时间获取当前时间戳，单位：秒
+        /// </summary>
+        /// <returns>当前时间戳，当服务端时间未设置过时，返回值为 0</returns>
+        public static long GetCurrentServerTime(){
+            if(LastServerTime == 0){
+                return 0;
+            }
+            long startUpTime = (long) Time.realtimeSinceStartup;
+            return LastServerTime + startUpTime - LastStartUpTime;
+        }
     }
 
     public static class TapHttpUtils
@@ -161,7 +183,7 @@ namespace TapSDK.Core.Standalone.Internal.Http
             StringBuilder sb = new StringBuilder();
             sb.AppendLine("=== HTTP Response Start ===");
             sb.AppendLine($"URL: {response.RequestMessage.RequestUri}");
-            sb.AppendLine($"Status Code: {response.StatusCode}");
+            sb.AppendLine($"Status Code: {response.StatusCode}"); 
             string contentString = null;
             try
             {

package/Standalone/Runtime/Public/TapCoreStandalone.cs

@@ -217,6 +217,7 @@ namespace TapSDK.Core.Standalone
         public static string GetCurrentUserId(){
             return User?.Id;
         }
+        
     }
 
     public interface IOpenIDProvider

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: 5777dc227a00a4ed9a0fb312ee3630e7
+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.5.2",
+  "version": "4.5.3",
   "unity": "2019.4",
   "license": "MIT",
   "dependencies": {