com.taptap.sdk.core 4.5.3 → 4.5.4

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

package/Runtime/Internal/Utils/ImageUtils.cs

@@ -9,8 +9,7 @@ using UnityEngine.Networking;
 
 namespace TapSDK.Core.Internal.Utils {
     public class ImageUtils {
-        private readonly static string CacheDirName = "tap-cache";
-
+        private readonly static string OldCacheDirName = "tap-cache";
         private readonly static MD5 md5 = MD5.Create();
 
         private readonly static Dictionary<string, WeakReference<Texture>> cachedTextures = new Dictionary<string, WeakReference<Texture>>();
@@ -136,11 +135,22 @@ namespace TapSDK.Core.Internal.Utils {
 
         static string CacheDirPath {
             get {
-                string path = Path.Combine(Application.persistentDataPath, CacheDirName);
-                if (!Directory.Exists(path)) {
-                    Directory.CreateDirectory(path);
+                
+                string newCacheDirPath = Path.Combine(Application.persistentDataPath, OldCacheDirName);
+                if (TapTapSDK.taptapSdkOptions != null && !string.IsNullOrEmpty(TapTapSDK.taptapSdkOptions.clientId) ){
+                    newCacheDirPath = Path.Combine(Application.persistentDataPath, OldCacheDirName + "_" + TapTapSDK.taptapSdkOptions.clientId);
+                }
+                if(!Directory.Exists(newCacheDirPath)) {
+                    string oldPath = Path.Combine(Application.persistentDataPath, OldCacheDirName);
+                    if (Directory.Exists(oldPath)) {
+                        Directory.Move(oldPath, newCacheDirPath);
+                    }
+                }
+               
+                if (!Directory.Exists(newCacheDirPath)) {
+                    Directory.CreateDirectory(newCacheDirPath);
                 }
-                return path;
+                return newCacheDirPath;
             }
         }
     }

package/Runtime/Public/DataStorage.cs

@@ -14,21 +14,32 @@ namespace TapSDK.Core
         private static byte[] Keys = { 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF };
         public static void SaveString(string key, string value)
         {
-            SaveStringToCache(key, value);
-            PlayerPrefs.SetString(key, EncodeString(value));
+            string storageKey = GenerateStorageKey(key);
+            SaveStringToCache(storageKey, value);
+            PlayerPrefs.SetString(storageKey, EncodeString(value));
         }
 
         public static string LoadString(string key)
         {
-            string value = LoadStringFromCache(key);
+            string storageKey = GenerateStorageKey(key);
+            string value = LoadStringFromCache(storageKey);
             if (!string.IsNullOrEmpty(value))
             {
                 return value;
             }
-            value = PlayerPrefs.HasKey(key) ? DecodeString(PlayerPrefs.GetString(key)) : null;
+            value = PlayerPrefs.HasKey(storageKey) ? DecodeString(PlayerPrefs.GetString(storageKey)) : null;
+            // 尝试从本地获取旧版本数据
+            if (value == null){
+                value = PlayerPrefs.HasKey(key) ? DecodeString(PlayerPrefs.GetString(key)) : null;
+                // 旧版本存在有效数据时，转储为新的 storageKey
+                if (value != null) {
+                    PlayerPrefs.SetString(storageKey, EncodeString(value));
+                    PlayerPrefs.DeleteKey(key);
+                }
+            }
             if (value != null)
             {
-                SaveStringToCache(key, value);
+                SaveStringToCache(storageKey, value);
             }
             return value;
         }
@@ -137,5 +148,13 @@ namespace TapSDK.Core
             }
             return physicalAddress;
         }
+
+        // 生成存储在本地文件中 key
+        private static string GenerateStorageKey(string originKey){
+            if(TapTapSDK.taptapSdkOptions != null && !string.IsNullOrEmpty(TapTapSDK.taptapSdkOptions.clientId)){
+                return originKey + "_" + TapTapSDK.taptapSdkOptions.clientId;
+            }
+           return originKey;
+        }
     }
 }

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

package/Standalone/Runtime/Internal/Constants.cs

@@ -13,7 +13,7 @@ namespace TapSDK.Core.Standalone.Internal {
         public readonly static string DEVICE_LOGIN = "device_login";
         public readonly static string USER_LOGIN = "user_login";
 
-        internal static string ClientSettingsFileName = "TapSDKClientSettings.json";
+        internal static string ClientSettingsFileName = "TapSDKClientSettings";
         internal static string ClientSettingsEventKey = "ClientSettingsEventKey";
     }
 

package/Standalone/Runtime/Internal/EventSender.cs

@@ -16,7 +16,7 @@ namespace TapSDK.Core.Standalone.Internal
 {
     public class EventSender
     {
-        private const string EventFilePath = "events.json";
+        private const string OldEventFilePath = "events.json";
 
         private readonly TapLog log = new TapLog("TapEvent");
         private string persistentDataPath = Application.persistentDataPath;
@@ -131,9 +131,25 @@ namespace TapSDK.Core.Standalone.Internal
             timer.Change(TimeSpan.FromSeconds(SendInterval), TimeSpan.FromSeconds(SendInterval));
         }
 
+        private string GetEventCacheFileName(){
+            if (TapTapSDK.taptapSdkOptions != null 
+            && !string.IsNullOrEmpty(TapTapSDK.taptapSdkOptions.clientId)){
+                return "events_" + TapTapSDK.taptapSdkOptions.clientId + ".json";
+            }
+            return OldEventFilePath;
+        }
+
         private void LoadEvents()
-        {
-            string filePath = Path.Combine(persistentDataPath, EventFilePath);
+        {   
+            string filePath = Path.Combine(persistentDataPath, GetEventCacheFileName());
+            if(!File.Exists(filePath)){
+                string oldFilePath = Path.Combine(persistentDataPath, OldEventFilePath);
+                // 兼容旧版本文件
+                if (File.Exists(oldFilePath)) {
+                    File.Move(oldFilePath, filePath);
+                }
+            }
+           
             if (File.Exists(filePath))
             {
                 string jsonData = File.ReadAllText(filePath);
@@ -165,13 +181,13 @@ namespace TapSDK.Core.Standalone.Internal
                 var eventList = eventQueue.ToList();
                 string jsonData = Json.Serialize(eventList);
 
-                if (string.IsNullOrEmpty(EventFilePath))
+                if (string.IsNullOrEmpty(GetEventCacheFileName()))
                 {
                     Debug.LogError("EventFilePath is null or empty");
                     return;
                 }
 
-                string filePath = Path.Combine(persistentDataPath, EventFilePath);
+                string filePath = Path.Combine(persistentDataPath, GetEventCacheFileName());
 
                 if (string.IsNullOrEmpty(filePath))
                 {

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

@@ -142,7 +142,17 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             }
             openlogStartParameter[TapOpenlogStartParamConstants.PARAM_LOG_TO_CONSOLE] = 1;
             openlogStartParameter[TapOpenlogStartParamConstants.PARAM_LOG_LEVEL] = 1;
-            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_DATA_DIR] = Path.Combine(Application.persistentDataPath, "OpenlogData");
+            string openLogDirPath = Path.Combine(Application.persistentDataPath, "OpenlogData");
+            if (TapTapSDK.taptapSdkOptions != null && !string.IsNullOrEmpty(TapTapSDK.taptapSdkOptions.clientId)){
+                openLogDirPath = Path.Combine(Application.persistentDataPath, "OpenlogData_" + TapTapSDK.taptapSdkOptions.clientId);
+                if( !Directory.Exists(openLogDirPath)){
+                    string oldPath = Path.Combine(Application.persistentDataPath, "OpenlogData");
+                    if(Directory.Exists(oldPath)){
+                        Directory.Move(oldPath, openLogDirPath);
+                    }
+                }
+            }
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_DATA_DIR] = openLogDirPath;
             openlogStartParameter[TapOpenlogStartParamConstants.PARAM_ENV] = "local";
             openlogStartParameter[TapOpenlogStartParamConstants.PARAM_PLATFORM] = "PC";
             openlogStartParameter[TapOpenlogStartParamConstants.PARAM_UA] = TapHttpUtils.GenerateUserAgent();

package/Standalone/Runtime/Internal/Prefs.cs

@@ -9,7 +9,7 @@ using TapSDK.Core;
 
 namespace TapSDK.Core.Standalone.Internal {
     public class Prefs {
-        internal static readonly string PERSISTENT_FILE_NAME = "tapdb_storage_v2";
+        internal static readonly string OLD_PERSISTENT_FILE_NAME = "tapdb_storage_v2";
 
         private string persistentFilePath;
 
@@ -20,12 +20,23 @@ namespace TapSDK.Core.Standalone.Internal {
         private readonly AutoResetEvent persistEvent;
 
         public Prefs() {
-            persistentFilePath = Path.Combine(Application.persistentDataPath, PERSISTENT_FILE_NAME);
+            string newCacheFileName = OLD_PERSISTENT_FILE_NAME;
+            if( TapTapSDK.taptapSdkOptions != null && !string.IsNullOrEmpty(TapTapSDK.taptapSdkOptions.clientId)) {
+                newCacheFileName = OLD_PERSISTENT_FILE_NAME + "_" + TapTapSDK.taptapSdkOptions.clientId;
+            }
+            persistentFilePath = Path.Combine(Application.persistentDataPath, newCacheFileName);
+            // 兼容旧版缓存文件
+            if( !File.Exists(persistentFilePath)) {
+                string oldPath = Path.Combine(Application.persistentDataPath, OLD_PERSISTENT_FILE_NAME);
+                if (File.Exists(oldPath)){
+                    File.Move(oldPath, persistentFilePath);
+                }
+            }
             if (File.Exists(persistentFilePath)) {
                 try {
                     string json = File.ReadAllText(persistentFilePath);
                     Dictionary<string, object> jsonData = Json.Deserialize(json) as Dictionary<string, object>;
-                    ConcurrentDictionary<string, object> data = new ConcurrentDictionary<string, object>(jsonData);
+                    data = new ConcurrentDictionary<string, object>(jsonData);
                 } catch (Exception e) {
                     TapLogger.Error(e.Message);
                     File.Delete(persistentFilePath);

package/Standalone/Runtime/Public/TapCoreStandalone.cs

@@ -37,7 +37,7 @@ namespace TapSDK.Core.Standalone
         public TapCoreStandalone()
         {
             // Instantiate modules
-            Prefs = new Prefs();
+           
             Tracker = new Tracker();
             User = new User();
             TapLoom.Initialize();
@@ -69,10 +69,19 @@ namespace TapSDK.Core.Standalone
             }
             TapLog.Log("SDK Init Options : ", "coreOption : " + JsonConvert.SerializeObject(coreOption) + "\notherOptions : " + JsonConvert.SerializeObject(otherOptions));
             coreOptions = coreOption;
-
+            if (Prefs == null) {
+                Prefs = new Prefs();
+            }
             TapOpenlogStandalone.Init();
 
-            var path = Path.Combine(Application.persistentDataPath, Constants.ClientSettingsFileName);
+            var path = Path.Combine(Application.persistentDataPath, Constants.ClientSettingsFileName + "_" + coreOption.clientId + ".json");
+            // 兼容旧版文件
+            if (!File.Exists(path)) {
+                var oldPath = Path.Combine(Application.persistentDataPath, Constants.ClientSettingsFileName + ".json");
+                if(File.Exists(oldPath)){
+                    File.Move(oldPath, path);
+                }
+            }
             if (File.Exists(path))
             {
                 var clientSettings = File.ReadAllText(path);
@@ -182,7 +191,7 @@ namespace TapSDK.Core.Standalone
         private void saveClientSettings(TapGatekeeper settings)
         {
             string json = JsonConvert.SerializeObject(settings);
-            File.WriteAllText(Path.Combine(Application.persistentDataPath, Constants.ClientSettingsFileName), json);
+            File.WriteAllText(Path.Combine(Application.persistentDataPath, Constants.ClientSettingsFileName + "_" + TapTapSDK.taptapSdkOptions.clientId + ".json"), json);
         }
 
         private void SetAutoEvent(TapGatekeeper gatekeeper)

package/package.json

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