com.taptap.sdk.core 4.5.1 → 4.5.2

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.1"/>
+    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.5.2"/>
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
-    <iosPod name="TapTapCoreSDK" version="~> 4.5.1" bitcodeEnabled="false" addToAllTargets="false"/>
+    <iosPod name="TapTapCoreSDK" version="~> 4.5.2" bitcodeEnabled="false" addToAllTargets="false"/>
   </iosPods>
 </dependencies>

package/Runtime/Internal/Log/TapLog.cs

@@ -63,10 +63,7 @@ namespace TapSDK.Core.Internal.Log
         // 输出带有自定义颜色和标签的错误
         public static void Error(string message, string detail = null, string tag = TAG, string module = null)
         {
-            if (Enabled)
-            {
-                Debug.LogError(GetFormattedMessage(message: message, detail: detail, colorHex: ErrorColor, tag: tag, module: module));
-            }
+            Debug.LogError(GetFormattedMessage(message: message, detail: detail, colorHex: ErrorColor, tag: tag, module: module));
         }
 
         // 格式化带有颜色和标签的消息

package/Runtime/Internal/Utils/EventManager.cs

@@ -8,6 +8,8 @@ namespace TapSDK.Core.Internal.Utils
     {
         public const string OnApplicationPause = "OnApplicationPause";
         public const string OnApplicationQuit = "OnApplicationQuit";
+
+        public const string OnComplianceUserChanged = "OnComplianceUserChanged";
         private Dictionary<string, Action<object>> eventRegistries = new Dictionary<string, Action<object>>();
         
         public static void AddListener(string eventName, Action<object> listener) {

package/Runtime/Internal/Utils/TapVerifyInitStateUtils.cs

@@ -0,0 +1,21 @@
+using TapSDK.Core.Internal.Log;
+
+
+namespace TapSDK.Core.Internal.Utils
+{
+    public class TapVerifyInitStateUtils
+    {
+    
+        public static void ShowVerifyErrorMsg(string error, string errorMsg)
+        {
+            if (error != null || error.Length > 0)
+            {
+                TapMessage.ShowMessage(error, TapMessage.Position.bottom, TapMessage.Time.twoSecond);
+            }
+            if (errorMsg != null && errorMsg.Length > 0)
+            {
+                TapLog.Error(errorMsg);
+            }
+        }
+    }
+}

package/Runtime/Internal/Utils/TapVerifyInitStateUtils.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2f1bb7b9efe304ef2a058482236a3e9e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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.1";
+        public static readonly string Version = "4.5.2";
         
         public static string SDKPlatform = "TapSDK-Unity";
 

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

@@ -67,6 +67,10 @@ namespace TapSDK.Core.Standalone.Internal.Http
                         { "X-Tap-Lang", TapHttpUtils.GenerateLanguage()},
                         { "User-Agent", TapHttpUtils.GenerateUserAgent()},
                     };
+                    string currentUserId = TapCoreStandalone.User?.Id;
+                    if(currentUserId != null && currentUserId.Length > 0) {
+                        headers.Add("X-Tap-SDK-Game-User-Id", currentUserId);
+                    }
                     if (enableAuthorization)
                     {
                         string authorization = TapHttpUtils.GenerateAuthorization(url, method.ToString());

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

@@ -75,6 +75,10 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             {
                 TdkOnAppStopped();
             });
+            EventManager.AddListener(EventManager.OnComplianceUserChanged, (userInfo) => 
+            {
+                TdkSetExtraAppDurationParams(userInfo.ToString());
+            });
 #endif            
         }
 

package/Standalone/Runtime/Public/TapCoreStandalone.cs

@@ -22,6 +22,9 @@ namespace TapSDK.Core.Standalone
         internal static Tracker Tracker;
         internal static User User;
         internal static TapTapSdkOptions coreOptions;
+        
+        // client 信息是否匹配
+        internal static bool isClientInfoMatched = true;
         internal static bool enableAutoEvent = true;
 
         internal static TapGatekeeper gatekeeperData = new TapGatekeeper();
@@ -56,6 +59,14 @@ namespace TapSDK.Core.Standalone
         /// <param name="otherOptions">Additional TapCore SDK options.</param>
         public void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions)
         {
+            if (coreOption.clientId == null || coreOption.clientId.Length == 0){
+                TapVerifyInitStateUtils.ShowVerifyErrorMsg("clientId 不能为空","clientId 不能为空");
+                return;
+            }
+            if(coreOption.clientToken == null || coreOption.clientToken.Length == 0) {
+                TapVerifyInitStateUtils.ShowVerifyErrorMsg("clientToken 不能为空","clientToken 不能为空");
+                return;
+            }
             TapLog.Log("SDK Init Options : ", "coreOption : " + JsonConvert.SerializeObject(coreOption) + "\notherOptions : " + JsonConvert.SerializeObject(otherOptions));
             coreOptions = coreOption;
 
@@ -159,6 +170,7 @@ namespace TapSDK.Core.Standalone
                    {
                        if (TapHttpErrorConstants.ERROR_INVALID_CLIENT.Equals(se.ErrorData.Error))
                        {
+                           isClientInfoMatched = false;
                            TapLog.Error("Init Failed", se.ErrorData.ErrorDescription);
                            TapMessage.ShowMessage(se.ErrorData.Msg, TapMessage.Position.bottom, TapMessage.Time.twoSecond);
                        }
@@ -184,6 +196,27 @@ namespace TapSDK.Core.Standalone
                 }
             }
         }
+
+        public static bool CheckInitState()
+        {
+            // 未初始化
+            if (coreOptions == null || coreOptions.clientId == null || coreOptions.clientId.Length  == 0
+            || coreOptions.clientToken == null || coreOptions.clientToken.Length == 0) {
+                TapVerifyInitStateUtils.ShowVerifyErrorMsg("当前应用还未初始化","当前应用还未初始化: 请在调用 SDK 业务接口前，先调用 TapTapSDK.Init  接口");
+                return false;
+            }
+            // 应用信息不匹配
+            if(isClientInfoMatched == false) {
+                TapVerifyInitStateUtils.ShowVerifyErrorMsg("当前应用初始化信息错误","当前应用初始化信息错误: 请在 TapTap 开发者中心检查当前应用调用初始化接口设置的 clientId 、clientToken 是否匹配");
+                return false;
+            }
+            return true;
+        }
+
+        // 获取当前用户设置的 DB userID
+        public static string GetCurrentUserId(){
+            return User?.Id;
+        }
     }
 
     public interface IOpenIDProvider

package/Standalone/Runtime/Public/TapEventStandalone.cs

@@ -21,6 +21,10 @@ namespace TapSDK.Core.Standalone
         /// <param name="userID">The user ID to set.</param>
         public void SetUserID(string userID)
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
             SetUserID(userID, null);
         }
 
@@ -31,6 +35,10 @@ namespace TapSDK.Core.Standalone
         /// <param name="properties">Additional properties to associate with the user.</param>
         public void SetUserID(string userID, string properties)
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
             if (!IsValidUserID(userID))
             {
                 TapLogger.Error("Invalid user ID, length should be 1-160 and only contains a-zA-Z0-9_+/=.,:");
@@ -46,6 +54,10 @@ namespace TapSDK.Core.Standalone
         /// </summary>
         public void ClearUser()
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
             User.Logout();
         }
 
@@ -55,6 +67,10 @@ namespace TapSDK.Core.Standalone
         /// <returns>The device ID.</returns>
         public string GetDeviceId()
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return "";
+            }
             return Identity.DeviceId;
         }
 
@@ -65,8 +81,13 @@ namespace TapSDK.Core.Standalone
         /// <param name="properties">Additional properties to associate with the event.</param>
         public void LogEvent(string name, string properties)
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
             // name 长度256非空，不符合的丢事件，打log
-            if (!checkLength(name)) {
+            if (!checkLength(name))
+            {
                 Debug.LogError(name + " Event name length should be less than or equal to 256 characters.");
                 return;
             }
@@ -80,6 +101,10 @@ namespace TapSDK.Core.Standalone
         /// <param name="properties">Additional properties to associate with the device initialization.</param>
         public void DeviceInitialize(string properties)
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
             Dictionary<string, object> prop = Json.Deserialize(properties) as Dictionary<string, object>;
             Tracker.TrackDeviceProperties(Constants.PROPERTY_INITIALIZE_TYPE, filterProperties(prop));
         }
@@ -90,6 +115,10 @@ namespace TapSDK.Core.Standalone
         /// <param name="properties">Additional properties to associate with the device update.</param>
         public void DeviceUpdate(string properties)
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
             Dictionary<string, object> prop = Json.Deserialize(properties) as Dictionary<string, object>;
             Tracker.TrackDeviceProperties(Constants.PROPERTY_UPDATE_TYPE, filterProperties(prop));
         }
@@ -100,6 +129,10 @@ namespace TapSDK.Core.Standalone
         /// <param name="properties">Additional properties to associate with the device addition.</param>
         public void DeviceAdd(string properties)
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
             Dictionary<string, object> prop = Json.Deserialize(properties) as Dictionary<string, object>;
             Tracker.TrackDeviceProperties(Constants.PROPERTY_ADD_TYPE, filterProperties(prop));
         }
@@ -110,6 +143,10 @@ namespace TapSDK.Core.Standalone
         /// <param name="properties">Additional properties to associate with the user initialization.</param>
         public void UserInitialize(string properties)
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
             Dictionary<string, object> prop = Json.Deserialize(properties) as Dictionary<string, object>;
             Tracker.TrackUserProperties(Constants.PROPERTY_INITIALIZE_TYPE, filterProperties(prop));
         }
@@ -120,6 +157,10 @@ namespace TapSDK.Core.Standalone
         /// <param name="properties">Additional properties to associate with the user update.</param>
         public void UserUpdate(string properties)
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
             Dictionary<string, object> prop = Json.Deserialize(properties) as Dictionary<string, object>;
             Tracker.TrackUserProperties(Constants.PROPERTY_UPDATE_TYPE, filterProperties(prop));
         }
@@ -130,6 +171,10 @@ namespace TapSDK.Core.Standalone
         /// <param name="properties">Additional properties to associate with the user addition.</param>
         public void UserAdd(string properties)
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
             Dictionary<string, object> prop = Json.Deserialize(properties) as Dictionary<string, object>;
             Tracker.TrackUserProperties(Constants.PROPERTY_ADD_TYPE, filterProperties(prop));
         }
@@ -141,11 +186,17 @@ namespace TapSDK.Core.Standalone
         /// <param name="value">The value of the common property.</param>
         public void AddCommonProperty(string key, string value)
         {
-            if (!checkLength(key)){
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
+            if (!checkLength(key))
+            {
                 Debug.LogError(key + " Property key length should be less than or equal to 256 characters.");
                 return;
             }
-            if (!checkLength(value)){
+            if (!checkLength(value))
+            {
                 Debug.LogError(value + " Property value length should be less than or equal to 256 characters.");
                 return;
             }
@@ -158,6 +209,10 @@ namespace TapSDK.Core.Standalone
         /// <param name="properties">The JSON string containing the common properties.</param>
         public void AddCommon(string properties)
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
             Dictionary<string, object> prop = Json.Deserialize(properties) as Dictionary<string, object>;
             Tracker.AddCommon(filterProperties(prop));
         }
@@ -168,6 +223,10 @@ namespace TapSDK.Core.Standalone
         /// <param name="key">The key of the common property to clear.</param>
         public void ClearCommonProperty(string key)
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
             Tracker.ClearCommonProperty(key);
         }
 
@@ -177,6 +236,10 @@ namespace TapSDK.Core.Standalone
         /// <param name="keys">The keys of the common properties to clear.</param>
         public void ClearCommonProperties(string[] keys)
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
             Tracker.ClearCommonProperties(keys);
         }
 
@@ -185,6 +248,10 @@ namespace TapSDK.Core.Standalone
         /// </summary>
         public void ClearAllCommonProperties()
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
             Tracker.ClearAllCommonProperties();
         }
 
@@ -199,7 +266,12 @@ namespace TapSDK.Core.Standalone
         /// <param name="properties">Additional properties to associate with the charge event.</param>
         public void LogChargeEvent(string orderID, string productName, long amount, string currencyType, string paymentMethod, string properties)
         {
-            if (amount <= 0 || amount > 100000000000) {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
+            if (amount <= 0 || amount > 100000000000)
+            {
                 UnityEngine.Debug.LogError(amount + " is invalid, amount should be in range (0, 100000000000]");
                 return;
             }
@@ -212,6 +284,10 @@ namespace TapSDK.Core.Standalone
         /// <param name="callback">The callback function that returns a JSON string containing the dynamic properties.</param>
         public void RegisterDynamicProperties(Func<string> callback)
         {
+            if (!TapCoreStandalone.CheckInitState())
+            {
+                return;
+            }
             DynamicProperties dynamicProperties = new DynamicProperties(callback);
             Tracker.RegisterDynamicPropsDelegate(dynamicProperties);
         }
@@ -243,9 +319,11 @@ namespace TapSDK.Core.Standalone
             }
         }
 
-        private bool checkLength(string value){
+        private bool checkLength(string value)
+        {
             var maxLength = 256;
-            if (value.Length <= 0 || value.Length > maxLength){
+            if (value.Length <= 0 || value.Length > maxLength)
+            {
                 return false;
             }
             return true;
@@ -261,19 +339,21 @@ namespace TapSDK.Core.Standalone
         private Dictionary<string, object> filterProperties(Dictionary<string, object> properties)
         {
             Dictionary<string, object> filteredProperties = new Dictionary<string, object>();
-            foreach (var property in properties)
-            {
-                if (property.Key.Length <= 0 || property.Key.Length > 256)
-                {
-                    Debug.Log(property.Key + " Property key length should be more then 0 and less than or equal to 256 characters.");
-                    continue;
-                }
-                if (property.Value.ToString().Length > 256)
+            if(properties != null) {
+                foreach (var property in properties)
                 {
-                    Debug.Log(property.Value + " Property value length should be less than or equal to 256 characters.");
-                    continue;
+                    if (property.Key.Length <= 0 || property.Key.Length > 256)
+                    {
+                        Debug.Log(property.Key + " Property key length should be more then 0 and less than or equal to 256 characters.");
+                        continue;
+                    }
+                    if (property.Value.ToString().Length > 256)
+                    {
+                        Debug.Log(property.Value + " Property value length should be less than or equal to 256 characters.");
+                        continue;
+                    }
+                    filteredProperties.Add(property.Key, property.Value);
                 }
-                filteredProperties.Add(property.Key, property.Value);
             }
             return filteredProperties;
         }

package/package.json

@@ -2,7 +2,7 @@
   "name": "com.taptap.sdk.core",
   "displayName": "TapTapSDK Core",
   "description": "TapTapSDK Core",
-  "version": "4.5.1",
+  "version": "4.5.2",
   "unity": "2019.4",
   "license": "MIT",
   "dependencies": {

package/Plugins.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9b372fd6a570748ddbf4c96d16ebbc2b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/link.xml

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

package/link.xml.meta

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