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

package/Runtime/Public/TapTapCompliance.cs

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

package/Standalone/Runtime/ComplianceWorker.cs

@@ -36,10 +36,8 @@ namespace TapSDK.Compliance
         /// <summary>
         /// 激活手动认证
         /// </summary>
-        /// <param name="activelyVerifyManually">是否为主动选择激活手动认证</param>
-        protected override async Task VerifyManuallyAsync(bool activelyVerifyManually)
+        protected override async Task VerifyManuallyAsync()
         {
-            var userId = TapTapComplianceManager.UserId;
             do 
             {
                 try 
@@ -109,7 +107,7 @@ namespace TapSDK.Compliance
                 // 计算时间
                 DateTimeOffset gameEndTime = Config.StrictEndTime;
                 DateTimeOffset now = DateTimeOffset.FromUnixTimeSeconds(GetCurrentTime()).ToOffset(DateTimeOffset.Now.Offset);
-                TimeSpan remain = gameEndTime - now;
+                TimeSpan remain = gameEndTime.TimeOfDay - now.TimeOfDay;
 
                 return new PlayableResult 
                 {
@@ -194,7 +192,7 @@ namespace TapSDK.Compliance
             try {
                 VerificationResult result = await Verification.FetchVerificationByTapToken(userId,accessToken);
                 UIManager.Instance.CloseLoading();
-                if(result.Status != null && result.Status.Equals(ComplianceConst.VERIFICATION_STATUS_SUCCESS)){
+                if(result.Status != null && !result.IsVerifyFailed){
                     tcs.TrySetResult(0);
                 }else{
                     tcs.TrySetResult(-1);
@@ -230,10 +228,10 @@ namespace TapSDK.Compliance
             if(holidays.Contains(currentDate)){
                 DateTimeOffset strictStart = Config.StrictStartTime;
                 DateTimeOffset strictEnd = Config.StrictEndTime;
-
                 bool playable;
-                TapLogger.Debug(" now = " + now + " ,start = " + strictStart + ", end = " + strictEnd);
-                playable = now >= strictStart && now < strictEnd;
+                TapLogger.Debug(" now = " + now.TimeOfDay + " ,start = " + strictStart.TimeOfDay + ", end = " + strictEnd.TimeOfDay);
+                playable = now.TimeOfDay >= strictStart.TimeOfDay && now.TimeOfDay < strictEnd.TimeOfDay;
+                TapLogger.Debug("check result = " + playable);
                 return playable;
             }
             return false;
@@ -251,7 +249,6 @@ namespace TapSDK.Compliance
         /// <summary>
         /// 打开中国实名制窗口
         /// </summary>
-        /// <param name="activelyVerifyManually">是否为主动选择激活手动认证</param>
         /// <returns></returns>
         private Task<VerificationResult> OpenVerificationPanelCn()
         {
@@ -306,13 +303,15 @@ namespace TapSDK.Compliance
                     TapLogger.Debug("[TapTap: ChinaCompliance] 获得登录Access Token!Token结果: {0}\n是否包括Compliance: {1}",
                         accessToken.ToJson(), HaveComplianceScope(accessToken));
                     if (HaveComplianceScope(accessToken)) {
-                        // 0-正常;1-走手动;-1-打断流程
+                        // 0-正常;1-异常;-1-实名失败
                         var fetchResult = await FetchByTapToken(userId, accessToken);
-                        if (fetchResult == 1) {
-                            UIManager.Instance.OpenToast("授权异常", UIManager.GeneralToastLevel.Error);
+                        if (fetchResult != 0 ) {
+                            /// 异常问题
+                            if (fetchResult == 1)
+                            {
+                                UIManager.Instance.OpenToast("授权异常", UIManager.GeneralToastLevel.Error);
+                            }
                             mannualVerify = 2;
-                        }else if (fetchResult == -1) {
-                           mannualVerify = 2;
                         }
                     }
                     else {
@@ -360,7 +359,7 @@ namespace TapSDK.Compliance
             // 手动认证
             if (mannualVerify != 0) {
                 try {
-                    await VerifyManuallyAsync(mannualVerify == 1);
+                    await VerifyManuallyAsync();
                 }
                 catch (TaskCanceledException) {
                     TapLogger.Debug("[TapTap: ChinaCompliance] 手动实名制过程中主动退出! 触发 TaskCanceledException");
@@ -368,82 +367,12 @@ namespace TapSDK.Compliance
                     return tcs.Task.Result;
                 }
             }
-
-            try {
-                var tempResult = await ValidateVerification(showPopupInVerification);
-                tcs.TrySetResult(tempResult);
-                bool isVerified = tempResult == 0;
-                if (isVerified && mannualVerify == 0) {
-                     ShowVerifiedToast();
-                }
-                //认证失败:前置无弹窗的话，回调取消；前置有弹窗，保持弹窗
-                else if (tempResult == -3) {
-                    if (showPopupInVerification) {
-                        tcs.TrySetResult(await GetVerificationResult(userId));
-                    }
-                    else {
-                        TapLogger.Debug("[TapTap: ChinaCompliance] 认证失败,并且没有前置弹窗,直接触发取消回调! 触发 TaskCanceledException");
-                        tcs.TrySetResult(StartUpResult.REAL_NAME_STOP);
-                    }
-                }
-            }
-            catch (TaskCanceledException) {
-                TapLogger.Debug("[TapTap: ChinaCompliance] 手动实名制过程中主动退出! 触发 TaskCanceledException");
-                tcs.TrySetResult(StartUpResult.REAL_NAME_STOP);
-            }
-            catch (Exception e) {
-                tcs.TrySetException(e);
-            }
-
-            return tcs.Task.Result;
+            return Verification.IsVerified ? 0 :  await ShowVerifingTip();
         }
         
-        /// <summary>
-        /// 验证已经获取到的 Verification 是否有效,如果有效,则直接返回;如果无效,则弹出相应的提示
-        /// </summary>
-        /// <param name="havePopupBefore">前置是否有弹窗</param>
-        /// <returns>-1:认证中;-2:实名信息为空;-3:认证未通过;0-认证成功</returns>
-        private async Task<int> ValidateVerification(bool havePopupBefore) {
-            var tcs = new TaskCompletionSource<int>();
-            if (Verification.Current == null) {
-                TapLogger.Error("[TapTap: ChinaCompliance] 已经获取过实名信息,但是到了验证阶段实名信息仍未空!");
-                tcs.TrySetResult(-2);
-            }
-            else if (Verification.IsVerifing) {
-                var tip = Config.GetInputIdentifyBlockingTip();
-                Action onOk = () => {
-                    TapLogger.Debug("[TapTap: ChinaCompliance] 认证中,退出游戏!");
-                    tcs.TrySetResult(-1);
-                    #if !UNITY_EDITOR
-                    Application.Quit();
-                    #else
-                    EditorApplication.isPlaying = false;
-                    #endif
-                };
-                TapComplianceUI.OpenHealthPaymentPanel(tip.Title, tip.Content, tip.PositiveButtonText, onOk);
-                await tcs.Task;
-            }
-            else if (Verification.IsVerifyFailed) {
-                // TODO:多语言
-                UIManager.Instance.OpenToast("认证未通过, 请在 Tap 客户端重新提交实名信息", UIManager.GeneralToastLevel.Error);
-                if (havePopupBefore) {
-                    tcs.TrySetResult(-3);
-                }
-                else {
-                    throw new TaskCanceledException();
-                }
-            }
-            else {
-                TapLogger.Debug("[TapTap: ChinaCompliance] 认证成功!接入认证!");
-                tcs.TrySetResult(0);
-            }
-
-            await tcs.Task;
-            return tcs.Task.Result;
-        }
         
         /// <summary>
-        /// 获取 Token,分为几种情况:1)不是TapUser的话,需要去展示授权界面,授权界面可能选择拒绝,这时转为手动;2)是TapUser,但是没有Compliance权限,这时也需要去展示授权界面;3)是TapUser,并且有Compliance权限,这时直接返回Token
+        /// 获取 Token,分为几种情况:1)不是TapUser的话,需要去展示包含手动的授权界面;2)是TapUser,这时需要去展示仅包含 Tap 的授权界面;
         /// </summary>
         /// <param name="userId"></param>
         /// <returns></returns>

package/Standalone/Runtime/Internal/ComplianceNewJob.cs

@@ -9,6 +9,7 @@ using TapSDK.Core;
 using TapSDK.Core.Standalone;
 using TapSDK.Core.Internal.Utils;
 using Newtonsoft.Json;
+using TapSDK.UI;
 
 namespace TapSDK.Compliance
 {
@@ -217,8 +218,10 @@ namespace TapSDK.Compliance
             TapTapComplianceManager.SetTestEnvironment(enable);
         }
 
-        public void OnInvokeExternalCallback(int code, string msg){
-            switch(code){
+        public void OnInvokeExternalCallback(int code, string msg)
+        {
+            switch (code)
+            {
                 case StartUpResult.LOGIN_SUCCESS:
                     TapTapComplianceManager.CanPlay = true;
                     break;
@@ -236,12 +239,13 @@ namespace TapSDK.Compliance
                 || code == StartUpResult.EXITED // 登出用户
                 || code == StartUpResult.AGE_LIMIT // 年龄限制
                 || code == StartUpResult.SWITCH_ACCOUNT // 切换账号
-                || code == StartUpResult.INVALID_CLIENT_OR_NETWORK_ERROR) { // 网络异常
-                    // 用户结束校验流程
-                    isCheckingUser = false;
-                }
-             // 在 openlog 中设置当前用户信息
-            if ( code == StartUpResult.LOGIN_SUCCESS || code == StartUpResult.EXITED || code == StartUpResult.SWITCH_ACCOUNT) 
+                || code == StartUpResult.INVALID_CLIENT_OR_NETWORK_ERROR)
+            { // 网络异常
+              // 用户结束校验流程
+                isCheckingUser = false;
+            }
+            // 在 openlog 中设置当前用户信息
+            if (code == StartUpResult.LOGIN_SUCCESS || code == StartUpResult.EXITED || code == StartUpResult.SWITCH_ACCOUNT)
             {
                 string userIdentifier = "";
                 string userSessionId = "";
@@ -250,21 +254,30 @@ namespace TapSDK.Compliance
                     userIdentifier = TapTapComplianceManager.UserId ?? "";
                     userSessionId = TapTapComplianceManager.CurrentSession ?? "";
                 }
-                Dictionary<string,string> userData = new Dictionary<string,string>() {
+                Dictionary<string, string> userData = new Dictionary<string, string>()
+                {
                     ["anti_addict_user_identifier"] = userIdentifier,
                     ["anti_addict_session_id"] = userSessionId
                 };
                 string userInfo = JsonConvert.SerializeObject(userData);
                 EventManager.TriggerEvent(EventManager.OnComplianceUserChanged, userInfo);
-            } 
+            }
 
-            if (StartUpResult.Contains(code)){
-                if(_externalCallbackList != null){
-                    foreach(Action<int, string> callback in _externalCallbackList){
+            if (StartUpResult.Contains(code))
+            {
+                if (_externalCallbackList != null)
+                {
+                    foreach (Action<int, string> callback in _externalCallbackList)
+                    {
                         callback?.Invoke(code, msg);
                     }
                 }
             }
+
+            if (code == StartUpResult.LOGIN_SUCCESS)
+            {
+                TapTapComplianceManager.ShowAntiAddictionTip();
+            }
         }
 
          /// <summary>

package/Standalone/Runtime/Internal/Model/Verification.cs

@@ -5,30 +5,30 @@ using TapSDK.Core;
 
 namespace TapSDK.Compliance.Model 
 {
-    public class VerificationResult 
+    public class VerificationResult
     {
 
         [JsonProperty("status")]
         public string Status { get; private set; }
 
-        [JsonProperty("anti_addiction_token")] 
+        [JsonProperty("anti_addiction_token")]
         internal string ComplianceToken { get; private set; }
-        
-        [JsonProperty("code")] 
+
+        [JsonProperty("code")]
         public int errorCode { get; private set; }
-        
-        [JsonProperty("error")] 
+
+        [JsonProperty("error")]
         public string error { get; private set; }
-        
-        [JsonProperty("error_description")] 
+
+        [JsonProperty("error_description")]
         public string errorDescription { get; private set; }
-        
-        [JsonProperty("msg")] 
+
+        [JsonProperty("msg")]
         public string msg { get; private set; }
-        
+
         internal VerificationResult() { }
 
-        internal VerificationResult(VerificationResult other) 
+        internal VerificationResult(VerificationResult other)
         {
             TapLogger.Debug("current state = " + other.Status);
             Status = other.Status;
@@ -38,6 +38,21 @@ namespace TapSDK.Compliance.Model
             errorDescription = other.errorDescription;
             msg = other.msg;
         }
+        
+        /// <summary>
+        /// 是否已认证
+        /// </summary>
+        internal bool IsVerified => Status?.Equals(ComplianceConst.VERIFICATION_STATUS_SUCCESS) ?? false;        
+        
+        /// <summary>
+        /// 是否在认证中
+        /// /// </summary>
+        internal bool IsVerifing => Status?.Equals(ComplianceConst.VERIFICATION_STATUS_WAITING) ?? false;
+        
+        /// <summary>
+        /// 是否认证失败
+        /// /// </summary>
+        internal bool IsVerifyFailed => Status?.Equals(ComplianceConst.VERIFICATION_STATUS_FAILED) ?? false;
     }
 
 
@@ -66,21 +81,6 @@ namespace TapSDK.Compliance.Model
 
         internal LocalVerification(VerificationResult obj) : base(obj) { }
 
-        /// <summary>
-        /// 是否已认证
-        /// </summary>
-        internal bool IsVerified => Status.Equals(ComplianceConst.VERIFICATION_STATUS_SUCCESS);        
-        
-        /// <summary>
-        /// 是否在认证中
-        /// /// </summary>
-        internal bool IsVerifing => Status.Equals(ComplianceConst.VERIFICATION_STATUS_WAITING);
-        
-        /// <summary>
-        /// 是否认证失败
-        /// /// </summary>
-        internal bool IsVerifyFailed => Status.Equals(ComplianceConst.VERIFICATION_STATUS_FAILED);
-
         internal bool CheckIsAdult => AgeLimit == Verification.AGE_LIMIT_ADULT || AgeLimit == Verification.UNKNOWN_AGE_ADULT;
 
 

package/Standalone/Runtime/Internal/TapTapComplianceManager.cs

@@ -215,6 +215,21 @@ namespace TapSDK.Compliance
         {
             return false;
         }
+
+         /// 首次通过，弹防沉迷提示文案
+        internal static void ShowAntiAddictionTip()
+        {
+            if (string.IsNullOrEmpty(UserId)){
+                return;
+            }
+            var userIdEncode = "compliance_tip_" + Tool.EncryptString(UserId);
+            var hasShowTip = !string.IsNullOrEmpty(DataStorage.LoadString(userIdEncode));
+            if (!hasShowTip)
+            {
+                TapMessage.ShowMessage("已通过防沉迷校验，祝您游戏愉快！", position:TapMessage.Position.bottom, time:TapMessage.Time.threeSecond);
+                DataStorage.SaveString(userIdEncode, "1");
+            }
+        }
         
         public static bool? useMobileUI;
         

package/Standalone/Runtime/Internal/UI/Controller/TaptapComplianceIDInputController.cs

@@ -146,11 +146,14 @@ namespace TapSDK.Compliance.Internal
                     isSending = false;
                     // 后端返回后按钮可用
                     submitButton.interactable = true;
-                    if (verificationResult.Status.Equals("pass"))
+                    if (!verificationResult.IsVerifyFailed)
                     {
                         // TODO@luran:本地化
                         Close();
-                        UIManager.Instance.OpenToast("提交成功", UIManager.GeneralToastLevel.Success);
+                        if (verificationResult.IsVerified)
+                        {
+                            UIManager.Instance.OpenToast("提交成功", UIManager.GeneralToastLevel.Success);
+                        }
                     }
                     OnVerified?.Invoke(verificationResult);
                 }

package/Standalone/Runtime/Internal/Verification.cs

@@ -8,7 +8,7 @@ using TapSDK.Login;
 
 namespace TapSDK.Compliance.Internal 
 {
-    public static class Verification 
+    public static class Verification
     {
         internal const int AGE_LIMIT_UNKNOWN = -1;
         internal const int AGE_LIMIT_CHILD = 0;
@@ -19,7 +19,7 @@ namespace TapSDK.Compliance.Internal
         internal const int UNKNOWN_AGE = 100;
         // 已实名，但未同意年龄段信息授权且成年
         internal const int UNKNOWN_AGE_ADULT = 110;
-        
+
         static readonly string VERIFICATION_FILENAME = "verification";
 
         static readonly string VERIFICATION_V2_FILENAME = "verification_v2";
@@ -40,46 +40,48 @@ namespace TapSDK.Compliance.Internal
         /// 快速获取身份信息
         /// </summary>
         /// <param name="userId"></param>
-        public static async Task Fetch(string userId) 
+        public static async Task Fetch(string userId)
         {
-            if(current != null && !current.UserId.Equals(userId)){
+            if (current != null && !current.UserId.Equals(userId))
+            {
                 Logout(false);
             }
             string filename = Tool.EncryptString(userId);
             // 存储 v2 token 数据   
-            if(persistenceV2 == null){ 
+            if (persistenceV2 == null)
+            {
                 persistenceV2 = new Persistence(Path.Combine(
                     VERIFICATION_V2_FILENAME,
-                    filename));   
+                    filename));
             }
             VerificationResult result;
-            try 
+            try
             {
                 LocalVerification localVerification;
                 TapLogger.Debug("start check v2 token in local");
                 //先检查本地是否有 v2 缓存
                 localVerification = await persistenceV2.Load<LocalVerification>();
-                if(localVerification != null && localVerification.ComplianceToken != null 
-                    && localVerification.ComplianceToken.Length > 0){
+                if (localVerification != null && localVerification.ComplianceToken != null
+                    && localVerification.ComplianceToken.Length > 0)
+                {
                     current = localVerification;
                     return;
                 }
-                try{
-                    await FetchByOldToken(userId);
-                }catch (Exception)
+                TapTapAccount tapAccount = await TapTapLogin.Instance.GetCurrentTapAccount();
+                AccessToken accessToken = tapAccount?.accessToken;
+                if (HasComplianceAuthInTapToken(accessToken))
                 {
-                    TapTapAccount tapAccount = await TapTapLogin.Instance.GetCurrentTapAccount();
-                    AccessToken accessToken =  tapAccount?.accessToken;
-                    if(HasComplianceAuthInTapToken(accessToken)){
-                        await FetchByTapToken(userId);
-                    }else{
-                        TapLogger.Debug("try get v2 token with userId");
-                        result = await Network.FetchVerification(userId);
-                        await Save(userId, result);
-                    }
+                    await FetchByTapToken(userId);
+                }
+                else
+                {
+                    TapLogger.Debug("try get v2 token with userId");
+                    result = await Network.FetchVerification(userId);
+                    await Save(userId, result);
                 }
-            } 
-            catch (Exception e) 
+
+            }
+            catch (Exception e)
             {
                 //首次异常报错
                 TapLogger.Debug("try get v2 token failed  error: " + e.Message);
@@ -88,56 +90,34 @@ namespace TapSDK.Compliance.Internal
             }
         }
 
-        internal static async Task FetchByOldToken(string userId) {
-            TapLogger.Debug("start check v1 token in local");
-            string filename = Tool.EncryptString(userId);
-             //存储 v1 token数据
-             if(persistence == null){
-                persistence = new Persistence(Path.Combine(
-                    VERIFICATION_FILENAME,
-                    filename));
-             }
-            LocalVerification  localVerification = await persistence.Load<LocalVerification>();
-            try{
-                if(localVerification != null && localVerification.ComplianceToken != null
-                    && localVerification.ComplianceToken.Length > 0){
-                    VerificationResult result = await Network.UpgradeToken(userId, localVerification.ComplianceToken);
-                    await Save(userId, result);
-                    persistence.Delete();
-                    return;
-                }
-            }catch(Exception e){
-                // 4xx 清除本地缓存
-                if(e is ComplianceException aee){
-                    TapLogger.Debug("get httpCode = " + aee.code + " so remove local old token");
-                    persistence.Delete();
-                }
-                throw e;
-            }
-            throw new Exception();
-        }
-
-        internal static async Task FetchByTapToken(string userId, AccessToken accessToken = null){
+        internal static async Task FetchByTapToken(string userId, AccessToken accessToken = null)
+        {
             TapLogger.Debug("start check tapToken in local");
             long timestamp = 0;
             int retryTimes = 1;
             VerificationResult result;
-            while(true){
-                if(accessToken == null){
+            while (true)
+            {
+                if (accessToken == null)
+                {
                     ///判断本地是否有包含 compliance 的 token
                     TapTapAccount tapAccount = await TapTapLogin.Instance.GetCurrentTapAccount();
-                    accessToken =  tapAccount?.accessToken;
+                    accessToken = tapAccount?.accessToken;
                 }
-                try{
-                    if(HasComplianceAuthInTapToken(accessToken)){
+                try
+                {
+                    if (HasComplianceAuthInTapToken(accessToken))
+                    {
                         TapLogger.Debug("try use tapToken to get v2 token");
-                        result = await Network.FetchVerificationByTapToken(userId,accessToken, timestamp);
+                        result = await Network.FetchVerificationByTapToken(userId, accessToken, timestamp);
                         await Save(userId, result);
                         return;
                     }
-                }catch(Exception e){
+                }
+                catch (Exception e)
+                {
                     //时间戳异常
-                    if (e is ComplianceException aee && aee.Error != null 
+                    if (e is ComplianceException aee && aee.Error != null
                         && aee.Error.Equals(ComplianceConst.SERVER_ERROR_TYPE_INVALID_TIME) && retryTimes > 0)
                     {
                         timestamp = aee.Now;
@@ -151,23 +131,28 @@ namespace TapSDK.Compliance.Internal
                 }
                 throw new Exception();
             }
-            
+
         }
 
-        internal static bool HasComplianceAuthInTapToken(AccessToken accessToken){
-            if(accessToken == null){
+        internal static bool HasComplianceAuthInTapToken(AccessToken accessToken)
+        {
+            if (accessToken == null)
+            {
                 return false;
             }
             bool useAgeRange = TapTapComplianceManager.config.useAgeRange;
-            if(useAgeRange){
-               return accessToken.scopeSet != null && accessToken.scopeSet.Contains(ComplianceWorker.SCOPE_COMPLIANCE);
-            }else{
-               return accessToken.scopeSet != null && 
-               (accessToken.scopeSet.Contains(ComplianceWorker.SCOPE_COMPLIANCE) || accessToken.scopeSet.Contains(ComplianceWorker.SCOPE_COMPLIANCE_BASIC));
+            if (useAgeRange)
+            {
+                return accessToken.scopeSet != null && accessToken.scopeSet.Contains(ComplianceWorker.SCOPE_COMPLIANCE);
+            }
+            else
+            {
+                return accessToken.scopeSet != null &&
+                (accessToken.scopeSet.Contains(ComplianceWorker.SCOPE_COMPLIANCE) || accessToken.scopeSet.Contains(ComplianceWorker.SCOPE_COMPLIANCE_BASIC));
             }
         }
 
-        
+
         /// <summary>
         /// 手动输入身份信息
         /// </summary>
@@ -177,14 +162,14 @@ namespace TapSDK.Compliance.Internal
         /// <returns></returns>
         internal static async Task<VerificationResult> FetchVerificationManual(string userId, string userName, string idCard)
         {
-            var tcs = new TaskCompletionSource<VerificationResult>();        
+            var tcs = new TaskCompletionSource<VerificationResult>();
             try
             {
                 VerificationResult result = await Network.FetchVerificationManual(userName, idCard);
                 tcs.SetResult(result);
                 await Save(userId, result);
-            } 
-            catch (Exception e) 
+            }
+            catch (Exception e)
             {
                 tcs.SetException(e);
                 TapLogger.Error(e.ToString());
@@ -202,11 +187,12 @@ namespace TapSDK.Compliance.Internal
         /// <returns></returns>
         public static async Task<VerificationResult> FetchVerificationByTapToken(string userId, AccessToken token)
         {
-            var tcs = new TaskCompletionSource<VerificationResult>();        
+            var tcs = new TaskCompletionSource<VerificationResult>();
             try
             {
                 await FetchByTapToken(userId, token);
-                if(persistenceV2 == null){
+                if (persistenceV2 == null)
+                {
                     var filename = Tool.EncryptString(userId);
                     persistenceV2 = new Persistence(Path.Combine(
                     VERIFICATION_V2_FILENAME,
@@ -214,8 +200,8 @@ namespace TapSDK.Compliance.Internal
                 }
                 VerificationResult result = await persistenceV2.Load<VerificationResult>();
                 tcs.SetResult(result);
-            } 
-            catch (Exception e) 
+            }
+            catch (Exception e)
             {
                 tcs.SetException(e);
                 TapLogger.Error(e.ToString());
@@ -225,14 +211,15 @@ namespace TapSDK.Compliance.Internal
             return await tcs.Task;
         }
 
-        public static async Task Save(string userId, VerificationResult verification) 
+        public static async Task Save(string userId, VerificationResult verification)
         {
-            current = new LocalVerification(verification) 
+            current = new LocalVerification(verification)
             {
                 UserId = userId
             };
             TapLogger.Debug("try save  v2 token to local");
-            if(persistenceV2 == null){
+            if (persistenceV2 == null)
+            {
                 var filename = Tool.EncryptString(userId);
                 persistenceV2 = new Persistence(Path.Combine(
                 VERIFICATION_V2_FILENAME,
@@ -241,12 +228,15 @@ namespace TapSDK.Compliance.Internal
             await persistenceV2.Save(current);
         }
 
-        public static async Task setAgeState(int ageLimit, bool isAdult){
-            if(current != null){
-                current.AgeLimit = ageLimit < 0 ? 
-                (isAdult ? UNKNOWN_AGE_ADULT : UNKNOWN_AGE ) : ageLimit;
+        public static async Task setAgeState(int ageLimit, bool isAdult)
+        {
+            if (current != null)
+            {
+                current.AgeLimit = ageLimit < 0 ?
+                (isAdult ? UNKNOWN_AGE_ADULT : UNKNOWN_AGE) : ageLimit;
                 current.IsAdult = isAdult;
-                if(persistenceV2 == null){
+                if (persistenceV2 == null)
+                {
                     var filename = Tool.EncryptString(current.UserId);
                     persistenceV2 = new Persistence(Path.Combine(
                     VERIFICATION_V2_FILENAME,
@@ -256,20 +246,22 @@ namespace TapSDK.Compliance.Internal
             }
         }
 
-        public static void ClearCacheVerfiction(){
+        public static void ClearCacheVerfiction()
+        {
             persistence?.Delete();
             persistenceV2?.Delete();
         }
 
-        internal static void Logout(bool needClearCache = true) 
+        internal static void Logout(bool needClearCache = true)
         {
             // if (IsVerified && !IsAdult)
             // {
-// #pragma warning disable CS4014
-//                 Network.CheckPlayable();
-// #pragma warning restore CS4014
+            // #pragma warning disable CS4014
+            //                 Network.CheckPlayable();
+            // #pragma warning restore CS4014
             // }
-            if(needClearCache){
+            if (needClearCache)
+            {
                 ClearCacheVerfiction();
             }
             persistence = null;
@@ -277,7 +269,7 @@ namespace TapSDK.Compliance.Internal
             current = null;
         }
 
-        internal static string GetCurrentToken() 
+        internal static string GetCurrentToken()
         {
             return current?.ComplianceToken;
         }
@@ -286,12 +278,12 @@ namespace TapSDK.Compliance.Internal
         /// 是否已认证
         /// </summary>
         public static bool IsVerified => current?.IsVerified ?? DEFAULT_VERIFIED;
-        
+
         /// <summary>
         /// 是否在认证中
         /// </summary>
         public static bool IsVerifing => current?.IsVerifing ?? DEFAULT_VERIFING;
-        
+
         /// <summary>
         /// 是否认证失败
         /// </summary>

package/Standalone/Runtime/Internal/Worker/BaseComplianceWorker.cs

@@ -32,8 +32,7 @@ namespace TapSDK.Compliance
         /// <summary>
         /// 激活手动认证
         /// </summary>
-        /// <param name="activelyVerifyManually">是否为主动选择激活手动认证</param>
-        protected abstract Task VerifyManuallyAsync(bool activelyVerifyManually);
+        protected abstract Task VerifyManuallyAsync();
         
         /// <summary>
         /// 检查未成年人可玩性
@@ -69,6 +68,10 @@ namespace TapSDK.Compliance
         /// <returns></returns>
         protected virtual async Task<int> OnCheckedPlayableWithMinorAsync(PlayableResult playable)
         {
+            if (playable.RemainTime > 0)
+            {
+                TapTapComplianceManager.ShowAntiAddictionTip();
+            }
             var tcs = new TaskCompletionSource<int>();
             Action onOk;
             if (playable.RemainTime > 0) {
@@ -344,40 +347,61 @@ namespace TapSDK.Compliance
         #region Internal
 
         public async Task<int> StartUp(string userId) {
-            var lastVerificationValid = await CheckLastVerificationValid(userId);
-            if (!lastVerificationValid) {
+            await FetchVerificationAsync(userId);
+            if (Verification.Current == null ||  Verification.IsVerifyFailed)
+            {
                 TapLogger.Debug("try get token internal by UI");
                 var result = await InternalStartup(userId);
-                // 目前只会返回 9002 和 0-认证成功 ,-1:认证中;-2:实名信息为空;-3:认证未通过;-4:code换取实名5xx异常
+                // 目前只会返回 9002 和 0-认证成功
                 // 9002 是 StartUpResult.REAL_NAME_STOP
-                if (result != 0) {
+                if (result != 0)
+                {
                     return result;
                 }
             }
-            else {
+            else if (Verification.IsVerifing)
+            {
+                return await ShowVerifingTip();
+            }
+            else
+            {
                 UIManager.Instance.CloseLoading();
             }
             return await OnVerificationFetched();
         }
 
-        private async Task<bool> CheckLastVerificationValid(string userId) {
-            await FetchVerificationAsync(userId);
-            return Verification.IsVerified;
+        /// <summary>
+        /// 显示实名中提示
+        /// </summary>
+        internal async Task<int> ShowVerifingTip()
+        {
+            var task = new TaskCompletionSource<int>();
+            var tip = Config.GetInputIdentifyBlockingTip();
+            Action onOk = () =>
+            {
+                TapLogger.Debug("[TapTap: ChinaCompliance] 认证中,实名取消!");
+                task.TrySetResult(StartUpResult.REAL_NAME_STOP);
+            };
+            TapComplianceUI.OpenHealthPaymentPanel(tip.Title, tip.Content, tip.PositiveButtonText, onOk);
+            return await task.Task;
         }
         /// <summary>
         /// 获得实名信息
         /// </summary>
-        public async Task FetchVerificationAsync(string userId){
+        public async Task FetchVerificationAsync(string userId)
+        {
             // 拉取服务端实名信息
-                try {
-                    await Verification.Fetch(userId);
-                    UIManager.Instance.CloseLoading();
-                }
-                catch (Exception e) {
-                    TapLogger.Error(e);
-                    UIManager.Instance.CloseLoading();
-                    //所有错误跳过，执行实名
-                }
+            try
+            {
+                await Verification.Fetch(userId);
+                UIManager.Instance.CloseLoading();
+            }
+            catch (Exception e)
+            {
+                TapLogger.Error(e);
+                UIManager.Instance.CloseLoading();
+                //所有错误跳过，执行实名
+            }
         }
         
         /// <summary>

package/link.xml.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 2621f25a6f7ee4b41b72671be0520177
+=======
+guid: 07c47b078fb194edca068de7ed08ffa1
+>>>>>>> 7453f549f (feat: pipeline build TapSDK4 Unity Demo changed version #no-ticket)
 TextScriptImporter:
   externalObjects: {}
   userData: 

package/package.json

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