com.taptap.sdk.cloudsave 4.10.4 → 4.10.5

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-cloudsave-unity:4.10.4" />
+    <androidPackage spec="com.taptap.sdk:tap-cloudsave-unity:4.10.5" />
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
-    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapSDK/CloudSave" version="4.10.4" />
+    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapSDK/CloudSave" version="4.10.5" />
   </iosPods>
 </dependencies>

package/Runtime/Public/TapTapCloudSave.cs

@@ -7,7 +7,7 @@ namespace TapSDK.CloudSave
 {
     public class TapTapCloudSave
     {
-        public static readonly string Version = "4.10.4";
+        public static readonly string Version = "4.10.5-alpha.5";
 
         public static void RegisterCloudSaveCallback(ITapCloudSaveCallback callback)
         {

package/Standalone/Plugins/macOS/libcloudsave_sdk.dylib.meta

@@ -0,0 +1,80 @@
+fileFormatVersion: 2
+guid: 3f8a2c1d7e4b9f05a6d3e8c2b1f74a90
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 0
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 0
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
+  - first:
+      Any:
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: OSX
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        AddToEmbeddedBinaries: false
+        CPU: AnyCPU
+        CompileFlags:
+        FrameworkDependencies:
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Standalone/Plugins/macOS.meta

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

package/Standalone/Plugins/x86_64/cloudsave_sdk.dll.meta

@@ -18,8 +18,8 @@ PluginImporter:
       settings:
         Exclude Android: 1
         Exclude Editor: 0
-        Exclude Linux64: 0
-        Exclude OSXUniversal: 0
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 1
         Exclude Win: 0
         Exclude Win64: 0
         Exclude iOS: 1
@@ -45,15 +45,15 @@ PluginImporter:
   - first:
       Standalone: Linux64
     second:
-      enabled: 1
+      enabled: 0
       settings:
-        CPU: AnyCPU
+        CPU: None
   - first:
       Standalone: OSXUniversal
     second:
-      enabled: 1
+      enabled: 0
       settings:
-        CPU: x86_64
+        CPU: None
   - first:
       Standalone: Win
     second:

package/Standalone/Runtime/TapCloudSaveStandalone.cs

@@ -51,6 +51,17 @@ namespace TapSDK.CloudSave.Standalone
                     { "key", loginKey },
                 };
                 int region = isRND ? 2 : 0;
+                try
+                {
+                    Directory.CreateDirectory(cacheDir);
+                }
+                catch (Exception e)
+                {
+                    Log($"TapCloudSave create cache directory failed, path = {cacheDir}, error = {e.Message}", true);
+                    NotifyInitFail();
+                    return;
+                }
+
                 try
                 {
                     Dictionary<string, object> initConfig = new Dictionary<string, object>()
@@ -78,16 +89,7 @@ namespace TapSDK.CloudSave.Standalone
                     Log("TapSdkCloudSaveInitialize result = " + initResult);
                     if (initResult < 0)
                     {
-                        RunOnMainThread(() =>
-                        {
-                            if (currentSaveCallback != null && currentSaveCallback.Count > 0)
-                            {
-                                foreach (var callback in currentSaveCallback)
-                                {
-                                    callback?.OnResult(TapCloudSaveResultCode.INIT_FAIL);
-                                }
-                            }
-                        });
+                        NotifyInitFail();
                     }
                     else
                     {
@@ -99,7 +101,8 @@ namespace TapSDK.CloudSave.Standalone
                 }
                 catch (Exception e)
                 {
-                    Log("TapSdkCloudSaveInitialize error " + e.Message);
+                    Log("TapSdkCloudSaveInitialize error " + e.Message, true);
+                    NotifyInitFail();
                 }
             });
 
@@ -469,24 +472,27 @@ namespace TapSDK.CloudSave.Standalone
             string seesionId = Guid.NewGuid().ToString();
             const string method = "registerCloudSaveCallback";
             TapCloudSaveTracker.Instance.TrackStart(method, seesionId);
-            if (currentSaveCallback == null)
-            {
-                currentSaveCallback = new List<ITapCloudSaveCallback>();
-            }
-            if (!currentSaveCallback.Contains(callback))
-            {
-                TapCloudSaveTracker.Instance.TrackSuccess(method, seesionId);
-                currentSaveCallback.Add(callback);
-                Log($"RegisterCloudSaveCallback: Added callback. Total callbacks: {currentSaveCallback.Count}");
-            }
-            else
+            lock (_lockObj)
             {
-                TapCloudSaveTracker.Instance.TrackFailure(
-                    method,
-                    seesionId,
-                    errorMessage: "callback has already registered"
-                );
-                Log("RegisterCloudSaveCallback: Callback already registered");
+                if (currentSaveCallback == null)
+                {
+                    currentSaveCallback = new List<ITapCloudSaveCallback>();
+                }
+                if (!currentSaveCallback.Contains(callback))
+                {
+                    TapCloudSaveTracker.Instance.TrackSuccess(method, seesionId);
+                    currentSaveCallback.Add(callback);
+                    Log($"RegisterCloudSaveCallback: Added callback. Total callbacks: {currentSaveCallback.Count}");
+                }
+                else
+                {
+                    TapCloudSaveTracker.Instance.TrackFailure(
+                        method,
+                        seesionId,
+                        errorMessage: "callback has already registered"
+                    );
+                    Log("RegisterCloudSaveCallback: Callback already registered");
+                }
             }
         }
 
@@ -495,7 +501,8 @@ namespace TapSDK.CloudSave.Standalone
             string seesionId = Guid.NewGuid().ToString();
             const string method = "unregisterCloudSaveCallback";
             TapCloudSaveTracker.Instance.TrackStart(method, seesionId);
-            
+            lock (_lockObj)
+            {
             if (currentSaveCallback != null && callback != null)
             {
                 if (currentSaveCallback.Contains(callback))
@@ -523,6 +530,7 @@ namespace TapSDK.CloudSave.Standalone
                 );
                 Log("UnregisterCloudSaveCallback: Callback or callback list is null");
             }
+            } // end lock
         }
 
         public Task<ArchiveData> UpdateArchive(
@@ -629,10 +637,7 @@ namespace TapSDK.CloudSave.Standalone
                 {
                     if (currentSaveCallback != null && currentSaveCallback.Count > 0)
                     {
-                        foreach (var callback in currentSaveCallback)
-                        {
-                            callback?.OnResult(TapCloudSaveResultCode.NEED_LOGIN);
-                        }
+                        RunOnMainThread(() => NotifyCloudSaveResult(TapCloudSaveResultCode.NEED_LOGIN));
                     }
                     TapCloudSaveTracker.Instance.TrackFailure(method, sessionId, -1, "not login");
                     return false;
@@ -690,6 +695,25 @@ namespace TapSDK.CloudSave.Standalone
             TapLoom.QueueOnMainThread(action);
         }
 
+        private void NotifyInitFail()
+        {
+            RunOnMainThread(() => NotifyCloudSaveResult(TapCloudSaveResultCode.INIT_FAIL));
+        }
+
+        private void NotifyCloudSaveResult(int resultCode)
+        {
+            ITapCloudSaveCallback[] snapshot;
+            lock (_lockObj)
+            {
+                if (currentSaveCallback == null || currentSaveCallback.Count == 0) return;
+                snapshot = currentSaveCallback.ToArray();
+            }
+            foreach (var callback in snapshot)
+            {
+                callback?.OnResult(resultCode);
+            }
+        }
+
         private void Log(string msg, bool isError = false)
         {
             if (cloudSaveLog == null)

package/Standalone/TapSDK.CloudSave.Standalone.Runtime.asmdef

@@ -9,7 +9,8 @@
     ],
     "includePlatforms": [
         "Editor",
-        "WindowsStandalone64"
+        "WindowsStandalone64",
+        "macOSStandalone"
     ],
     "excludePlatforms": [],
     "allowUnsafeCode": false,

package/package.json

@@ -2,11 +2,11 @@
   "name": "com.taptap.sdk.cloudsave",
   "displayName": "TapTapSDK CloudSave",
   "description": "TapTapSDK CloudSave",
-  "version": "4.10.4",
+  "version": "4.10.5",
   "unity": "2019.4",
   "license": "MIT",
   "dependencies": {
-    "com.taptap.sdk.core": "4.10.4",
-    "com.taptap.sdk.login": "4.10.4"
+    "com.taptap.sdk.core": "4.10.5",
+    "com.taptap.sdk.login": "4.10.5"
   }
 }