com.tapsdk.antiaddiction 0.0.38 → 3.25.0-dev.2

package/Mobile/Runtime/AntiAddictionMobileOldJob.cs

@@ -14,7 +14,6 @@ namespace TapTap.AntiAddiction
             get => _externalCallback;
         }
         
-        public int AgeRange => MobileBridgeAntiAddiction.CurrentUserAgeLimit();
 
         /// <summary>
         /// 剩余时间(单位:秒)
@@ -54,6 +53,11 @@ namespace TapTap.AntiAddiction
             MobileBridgeAntiAddiction.Startup(useTapLogin, userId);
         }
 
+        public void StartupWithTapTap(string userId)
+        {
+            MobileBridgeAntiAddiction.StartupWithTapTap(userId);
+        }
+
         public void Startup(string userId, bool isTapUser)
         {
             MobileBridgeAntiAddiction.Startup(userId, isTapUser);

package/Mobile/Runtime/PluginBridge.cs

@@ -8,7 +8,7 @@ namespace Plugins.AntiAddictionUIKit
     public static class AntiAddictionUIKit
     {
         // Game object is created to receive async messages
-        private const string UNITY_SDK_VERSION = "3.18.7-a1";
+        private const string UNITY_SDK_VERSION = "3.22.0";
         private const string GAME_OBJECT_NAME = "PluginBridge";
         private static GameObject gameObject;
 
@@ -48,7 +48,12 @@ namespace Plugins.AntiAddictionUIKit
         #if UNITY_IOS
         [DllImport("__Internal")]
         #endif
-        private static extern void TapSDKStartupWithUserId(string userIdentifier, bool isTapUser);
+        private static extern void TapSDKStartupWithTapTap(string userIdentifier, bool isTapUser);
+
+        #if UNITY_IOS
+        [DllImport("__Internal")]
+        #endif
+        private static extern void TapSDKStartupWithTapTap(string userIdentifier);
 
 
         #if UNITY_IOS
@@ -269,7 +274,21 @@ namespace Plugins.AntiAddictionUIKit
             }
         }
 
-         public static void Startup(string userIdentifier, bool isTapUser) {
+        public static void StartupWithTapTap(string userIdentifier) {
+            switch (Application.platform)
+            {
+                case RuntimePlatform.Android:
+                    PerformAndroidStartupWithTapTap(userIdentifier);
+                    break;
+                case RuntimePlatform.IPhonePlayer:
+                    PerformiOSStartupWithTapTap(userIdentifier);
+                    break;
+                default:
+                    throw new PlatformNotSupportedException();
+            }
+        }
+
+        public static void Startup(string userIdentifier, bool isTapUser) {
             switch (Application.platform)
             {
                 case RuntimePlatform.Android:
@@ -523,6 +542,14 @@ namespace Plugins.AntiAddictionUIKit
             androidJavaNativeAntiAddiction.Call("startup", unityActivity, userIdentifier, isTapUser);
         }
 
+        private static void PerformAndroidStartupWithTapTap(string userIdentifier)
+        {
+            Debug.Log("Android startupWithTapTap new calling");
+            AndroidJavaClass unityClass = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
+            AndroidJavaObject unityActivity = unityClass.GetStatic<AndroidJavaObject>("currentActivity");
+            androidJavaNativeAntiAddiction.Call("startupWithTapTap", unityActivity, userIdentifier);
+        }
+
         private static string PerformAndroidGetCurrentToken()
         {
             Debug.Log("Android getCurrrentToken calling");
@@ -634,7 +661,13 @@ namespace Plugins.AntiAddictionUIKit
             )
         {
             Debug.Log("PerformiOSStartupNew:" + userIdentifier);
-            TapSDKStartupWithUserId(userIdentifier, isTapUser);
+            TapSDKStartupWithTapTap(userIdentifier, isTapUser);
+        }
+
+        private static void PerformiOSStartupWithTapTap(string userIdentifier)
+        {
+            Debug.Log("PerformiOSStartupWithTapTap:" + userIdentifier);
+            TapSDKStartupWithTapTap(userIdentifier);
         }
 
         private static string PerformiOSGetCurrentToken()

package/Plugins/Android/{AntiAddictionUI_3.21.0.aar.meta → AntiAddictionUI_3.23.0.aar.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 41881f281985449b19ec46aa697c7685
+guid: 3d86c444e02664d86ac90d63424782de
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

package/Plugins/Android/{AntiAddiction_3.21.0.aar.meta → AntiAddiction_3.23.0.aar.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 25e40f36da64f4028b41f4af191e3c9c
+guid: 361a0ac39df5844f881f0d8f2cd020a0
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

package/Plugins/iOS/AntiAddictionService.framework/Headers/AntiAddictionService-Swift.h

@@ -318,6 +318,7 @@ typedef SWIFT_ENUM(NSInteger, AntiAddictionRealNameAuthState, open) {
 };
 
 @protocol AntiAddictionServiceCallback;
+@class NSError;
 
 SWIFT_CLASS_NAMED("AntiAddictionService")
 @interface AntiAddictionService : NSObject
@@ -354,7 +355,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) AntiAddictionConfigura
 /// \param gameIdentifier 游戏唯一标识符
 ///
 + (void)init:(id <AntiAddictionServiceCallback> _Nonnull)delegate gameIdentifier:(NSString * _Nullable)gameIdentifier SWIFT_METHOD_FAMILY(none);
-+ (void)tapTokenLoginWithKid:(NSString * _Nonnull)kid mackey:(NSString * _Nonnull)mackey clientID:(NSString * _Nonnull)clientID successHandler:(void (^ _Nullable)(NSString * _Nonnull))successHandler failureHandler:(void (^ _Nullable)(NSString * _Nonnull))failureHandler;
++ (void)fastRealNameWithClientId:(NSString * _Nonnull)clientId userId:(NSString * _Nonnull)userId tapToken:(NSString * _Nonnull)tapToken completion:(void (^ _Nonnull)(enum AntiAddictionRealNameAuthState, NSString * _Nonnull, enum AntiAddictionRealNameAgeLimit))completion failureHandler:(void (^ _Nonnull)(NSError * _Nonnull))failureHandler;
 /// 登录用户
 /// \param userToken 用户唯一标识符,
 ///
@@ -365,6 +366,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) AntiAddictionConfigura
 + (void)loginWithUserToken:(NSString * _Nonnull)userToken accessToken:(NSString * _Nonnull)accessToken ageLimit:(enum AntiAddictionRealNameAgeLimit)ageLimit;
 /// 进入游戏
 + (void)enterGame;
++ (void)enterGameWithIsActive:(BOOL)isActive;
 /// 离开游戏
 + (void)leaveGame;
 /// 退出用户登录
@@ -405,7 +407,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) AntiAddictionConfigura
 + (BOOL)isHoliday SWIFT_WARN_UNUSED_RESULT;
 /// 生成身份证兑换码（有效期从生成起6个小时整以内）
 + (NSString * _Nonnull)generateIDCode SWIFT_WARN_UNUSED_RESULT;
-+ (void)startTimeStaticWithIsLogin:(BOOL)isLogin;
++ (void)startTimeStatic;
 + (void)stopTimeStatic;
 /// 实名认证
 /// \param userToken 用户唯一标识，如用户 ID
@@ -416,7 +418,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) AntiAddictionConfigura
 ///
 /// \param completion 结果回调
 ///
-+ (void)realNameAuthWithClientId:(NSString * _Nonnull)clientId userId:(NSString * _Nonnull)userId code:(NSString * _Nonnull)code name:(NSString * _Nonnull)name idCard:(NSString * _Nonnull)idCard completion:(void (^ _Nonnull)(enum AntiAddictionRealNameAuthState, NSString * _Nonnull, enum AntiAddictionRealNameAgeLimit))completion failureHandler:(void (^ _Nonnull)(NSString * _Nonnull))failureHandler;
++ (void)realNameAuthWithClientId:(NSString * _Nonnull)clientId userId:(NSString * _Nonnull)userId code:(NSString * _Nonnull)code name:(NSString * _Nonnull)name idCard:(NSString * _Nonnull)idCard isFallBack:(BOOL)isFallBack completion:(void (^ _Nonnull)(enum AntiAddictionRealNameAuthState, NSString * _Nonnull, enum AntiAddictionRealNameAgeLimit))completion failureHandler:(void (^ _Nonnull)(NSString * _Nonnull))failureHandler;
 /// 检查实名状态
 /// \param userToken 用户唯一标识，如用户 ID
 ///
@@ -789,6 +791,7 @@ typedef SWIFT_ENUM(NSInteger, AntiAddictionRealNameAuthState, open) {
 };
 
 @protocol AntiAddictionServiceCallback;
+@class NSError;
 
 SWIFT_CLASS_NAMED("AntiAddictionService")
 @interface AntiAddictionService : NSObject
@@ -825,7 +828,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) AntiAddictionConfigura
 /// \param gameIdentifier 游戏唯一标识符
 ///
 + (void)init:(id <AntiAddictionServiceCallback> _Nonnull)delegate gameIdentifier:(NSString * _Nullable)gameIdentifier SWIFT_METHOD_FAMILY(none);
-+ (void)tapTokenLoginWithKid:(NSString * _Nonnull)kid mackey:(NSString * _Nonnull)mackey clientID:(NSString * _Nonnull)clientID successHandler:(void (^ _Nullable)(NSString * _Nonnull))successHandler failureHandler:(void (^ _Nullable)(NSString * _Nonnull))failureHandler;
++ (void)fastRealNameWithClientId:(NSString * _Nonnull)clientId userId:(NSString * _Nonnull)userId tapToken:(NSString * _Nonnull)tapToken completion:(void (^ _Nonnull)(enum AntiAddictionRealNameAuthState, NSString * _Nonnull, enum AntiAddictionRealNameAgeLimit))completion failureHandler:(void (^ _Nonnull)(NSError * _Nonnull))failureHandler;
 /// 登录用户
 /// \param userToken 用户唯一标识符,
 ///
@@ -836,6 +839,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) AntiAddictionConfigura
 + (void)loginWithUserToken:(NSString * _Nonnull)userToken accessToken:(NSString * _Nonnull)accessToken ageLimit:(enum AntiAddictionRealNameAgeLimit)ageLimit;
 /// 进入游戏
 + (void)enterGame;
++ (void)enterGameWithIsActive:(BOOL)isActive;
 /// 离开游戏
 + (void)leaveGame;
 /// 退出用户登录
@@ -876,7 +880,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) AntiAddictionConfigura
 + (BOOL)isHoliday SWIFT_WARN_UNUSED_RESULT;
 /// 生成身份证兑换码（有效期从生成起6个小时整以内）
 + (NSString * _Nonnull)generateIDCode SWIFT_WARN_UNUSED_RESULT;
-+ (void)startTimeStaticWithIsLogin:(BOOL)isLogin;
++ (void)startTimeStatic;
 + (void)stopTimeStatic;
 /// 实名认证
 /// \param userToken 用户唯一标识，如用户 ID
@@ -887,7 +891,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) AntiAddictionConfigura
 ///
 /// \param completion 结果回调
 ///
-+ (void)realNameAuthWithClientId:(NSString * _Nonnull)clientId userId:(NSString * _Nonnull)userId code:(NSString * _Nonnull)code name:(NSString * _Nonnull)name idCard:(NSString * _Nonnull)idCard completion:(void (^ _Nonnull)(enum AntiAddictionRealNameAuthState, NSString * _Nonnull, enum AntiAddictionRealNameAgeLimit))completion failureHandler:(void (^ _Nonnull)(NSString * _Nonnull))failureHandler;
++ (void)realNameAuthWithClientId:(NSString * _Nonnull)clientId userId:(NSString * _Nonnull)userId code:(NSString * _Nonnull)code name:(NSString * _Nonnull)name idCard:(NSString * _Nonnull)idCard isFallBack:(BOOL)isFallBack completion:(void (^ _Nonnull)(enum AntiAddictionRealNameAuthState, NSString * _Nonnull, enum AntiAddictionRealNameAgeLimit))completion failureHandler:(void (^ _Nonnull)(NSString * _Nonnull))failureHandler;
 /// 检查实名状态
 /// \param userToken 用户唯一标识，如用户 ID
 ///

package/Plugins/iOS/AntiAddictionService.framework/Headers/RSAObjC.h

@@ -7,8 +7,16 @@
 
 #import <Foundation/Foundation.h>
 
+typedef NS_ENUM(NSInteger, TapRSAEncryptionPaddingType) {
+    TapRSAEncryptionPaddingTypeNone      = 0,
+    TapRSAEncryptionPaddingTypePKCS1     = 1,
+    TapRSAEncryptionPaddingTypeOAEP      = 2,
+};
+
 @interface RSAObjC : NSObject
 
++ (void)setDefaultPaddingType:(TapRSAEncryptionPaddingType)paddingType;
+
 /**
  * -------RSA 字符串公钥加密-------
  @param plaintext 明文，待加密的字符串