com.taptap.sdk.compliance 4.4.2 → 4.5.0

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-compliance:4.4.2"/>
+    <androidPackage spec="com.taptap.sdk:tap-compliance:4.5.0"/>
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
-    <iosPod name="TapTapComplianceSDK" version="~> 4.4.0" bitcodeEnabled="false" addToAllTargets="false"/>
+    <iosPod name="TapTapComplianceSDK" version="~> 4.5.0" bitcodeEnabled="false" addToAllTargets="false"/>
   </iosPods>
 </dependencies>

package/Runtime/Public/TapTapCompliance.cs

@@ -10,7 +10,7 @@ namespace TapSDK.Compliance
     public static class TapTapCompliance
     {
 
-        public static readonly string Version = "4.4.2";
+        public static readonly string Version = "4.5.0";
 
         public static void RegisterComplianceCallback(Action<int, string> callback)
         {

package/Runtime/Public/TapTapComplianceOption.cs

@@ -17,10 +17,6 @@ namespace TapSDK.Compliance
             get => _moduleName;
         }
 
-        public  AndroidJavaObject androidObject => 
-             new AndroidJavaObject("com.taptap.sdk.compilance.option.TapTapComplianceOptions", showSwitchAccount, useAgeRange);
-        
-
         internal string clientId;
         
         

package/Standalone/Runtime/ComplianceWorker.cs

@@ -152,32 +152,32 @@ namespace TapSDK.Compliance
             }
         }
         
-        private static async Task<ComplianceCodeData> GetComplianceCode(string clientId, AccessToken token) {
-            string url = TapTapSdk.CurrentRegion.ApiHost() + "/account/compliance/v1?client_id=" + clientId;
-            var uri = new Uri(url);
-            var sign = GetMacToken(token, uri);
-            var headers = new Dictionary<string, object> {
-                { "Authorization", sign }
-            };
-            ComplianceCodeResponse response = await LoginService.HttpClient.Get<ComplianceCodeResponse>(url, headers: headers);
-            return response.Data;
-        }
+        // private static async Task<ComplianceCodeData> GetComplianceCode(string clientId, AccessToken token) {
+        //     string url = TapTapSdk.CurrentRegion.ApiHost() + "/account/compliance/v1?client_id=" + clientId;
+        //     var uri = new Uri(url);
+        //     var sign = GetMacToken(token, uri);
+        //     var headers = new Dictionary<string, object> {
+        //         { "Authorization", sign }
+        //     };
+        //     ComplianceCodeResponse response = await LoginService.HttpClient.Get<ComplianceCodeResponse>(url, headers: headers);
+        //     return response.Data;
+        // }
         
-        private static string GetMacToken(AccessToken token, Uri uri, int timestamp = 0) {
-            var ts = timestamp;
-            if (ts == 0) {
-                var dt = DateTime.UtcNow - new DateTime(1970, 1, 1);
-                ts = (int)dt.TotalSeconds;
-            }
-            var sign = "MAC " + LoginService.GetAuthorizationHeader(token.kid,
-                token.macKey,
-                token.macAlgorithm,
-                "GET",
-                uri.PathAndQuery,
-                uri.Host,
-                "443", ts);
-            return sign;
-        }
+        // private static string GetMacToken(AccessToken token, Uri uri, int timestamp = 0) {
+        //     var ts = timestamp;
+        //     if (ts == 0) {
+        //         var dt = DateTime.UtcNow - new DateTime(1970, 1, 1);
+        //         ts = (int)dt.TotalSeconds;
+        //     }
+        //     var sign = "MAC " + LoginService.GetAuthorizationHeader(token.kid,
+        //         token.macKey,
+        //         token.macAlgorithm,
+        //         "GET",
+        //         uri.PathAndQuery,
+        //         uri.Host,
+        //         "443", ts);
+        //     return sign;
+        // }
         
         /// <summary>
         /// 使用 TapToken 获取实名信息

package/Standalone/Runtime/Internal/ComplianceNewJob.cs

@@ -5,12 +5,16 @@ using TapSDK.Compliance.Internal;
 using TapSDK.Compliance.Model;
 using System.Collections.Generic;
 using TapSDK.Compliance.Standalone.Internal;
+using TapSDK.Core;
 
 namespace TapSDK.Compliance
 {
     public sealed class ComplianceNewJob : IComplianceJob
     {
         internal bool UseAgeRange = true;
+
+         // 是否正在处理用户信息，当调用 startup 接口后设置为 true， 当通知游戏回调时设置为 false
+        internal volatile bool isCheckingUser = false;
         private List<Action<int, string>> _externalCallbackList;
 
         public List<Action<int, string>> ExternalCallbackList
@@ -84,6 +88,12 @@ namespace TapSDK.Compliance
         
         public async void Startup(string userId)
         {
+            // 如果正在处理中，直接返回
+            if (isCheckingUser) {
+                TapLogger.Debug(" current user is checking so return");
+                return;
+            }
+            isCheckingUser = true;
             string sessionId = Guid.NewGuid().ToString();
             TapComplianceTracker.Instance.TrackStart("startup", sessionId);
             if(TapTapComplianceManager.UserId != null){
@@ -107,8 +117,6 @@ namespace TapSDK.Compliance
                     TapComplianceTracker.Instance.TrackCancel("startup", sessionId);
                     break;
             }
-            if (StartUpResult.Contains(code)){
-            }
             OnInvokeExternalCallback(code,null);
         }
         
@@ -183,6 +191,15 @@ namespace TapSDK.Compliance
                     TapTapComplianceManager.CanPlay = false;
                     break;
             }
+            if (code == StartUpResult.LOGIN_SUCCESS // 通过校验
+                || code == StartUpResult.REAL_NAME_STOP // 取消校验
+                || code == StartUpResult.EXITED // 登出用户
+                || code == StartUpResult.AGE_LIMIT // 年龄限制
+                || code == StartUpResult.SWITCH_ACCOUNT // 切换账号
+                || code == StartUpResult.INVALID_CLIENT_OR_NETWORK_ERROR) { // 网络异常
+                    // 用户结束校验流程
+                    isCheckingUser = false;
+                }
             if (StartUpResult.Contains(code)){
                 if(_externalCallbackList != null){
                     foreach(Action<int, string> callback in _externalCallbackList){

package/package.json

@@ -2,11 +2,11 @@
   "name": "com.taptap.sdk.compliance",
   "displayName": "TapTapSDK Compliance",
   "description": "TapTapSDK Compliance",
-  "version": "4.4.2",
+  "version": "4.5.0",
   "unity": "2019.4",
   "license": "MIT",
   "dependencies": {
-    "com.taptap.sdk.core": "4.4.2",
-    "com.taptap.sdk.login": "4.4.2"
+    "com.taptap.sdk.core": "4.5.0",
+    "com.taptap.sdk.login": "4.5.0"
   }
 }

package/link.xml

@@ -1,5 +0,0 @@
-<linker>
-  <assembly fullname="TapSDK.Compliance" preserve="all" />
-  <assembly fullname="TapSDK.Compliance.Runtime" preserve="all" />
-  <assembly fullname="TapSDK.Compliance.Mobile.Runtime" preserve="all" />
-</linker>

package/link.xml.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 85e09aeb6ba204417a7ea0169ec55a29
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: