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

package/Mobile/Runtime/TapCloudSaveBridge.cs

@@ -22,6 +22,10 @@ namespace TapSDK.CloudSave.Mobile
 
         public static string TDS_CLOUDSAVE_SERVICE_IMPL = "com.taptap.sdk.cloudsave.unity.BridgeCloudSaveServiceImpl";
 
+        // 全局callback管理
+        private readonly List<ITapCloudSaveCallback> callbacks = new List<ITapCloudSaveCallback>();
+        private bool hasRegisteredNativeCallback = false;
+
         public TapCloudSaveBridge()
         {
             EngineBridge.GetInstance().Register(TDS_CLOUDSAVE_SERVICE_CLZ, TDS_CLOUDSAVE_SERVICE_IMPL);
@@ -34,47 +38,160 @@ namespace TapSDK.CloudSave.Mobile
 
         public void RegisterCloudSaveCallback(ITapCloudSaveCallback callback)
         {
-            TapLog.Log("[TapCloudSaveBridge] RegisterCloudSaveCallback called (UNCHANGED callback pattern)");
-            EngineBridge.GetInstance().CallHandler(new Command.Builder()
+            TapLog.Log("[TapCloudSaveBridge] RegisterCloudSaveCallback called with global callback management");
+            
+            if (callback != null)
+            {
+                // 添加到全局callback列表
+                if (!callbacks.Contains(callback))
+                {
+                    callbacks.Add(callback);
+                    TapLog.Log($"[TapCloudSaveBridge] Added callback. Total callbacks: {callbacks.Count}");
+                }
+                else
+                {
+                    TapLog.Log("[TapCloudSaveBridge] Callback already registered");
+                }
+
+                // 初始化注册原生callback（只注册一次）
+                InitRegisterNativeCallback();
+            }
+        }
+
+        public void UnregisterCloudSaveCallback(ITapCloudSaveCallback callback)
+        {
+            TapLog.Log("[TapCloudSaveBridge] UnregisterCloudSaveCallback called");
+            
+            if (callback != null)
+            {
+                if (callbacks.Contains(callback))
+                {
+                    callbacks.Remove(callback);
+                    TapLog.Log($"[TapCloudSaveBridge] Removed callback. Remaining callbacks: {callbacks.Count}");
+                    
+                    // 当没有callback时，取消注册原生callback
+                    if (callbacks.Count == 0 && hasRegisteredNativeCallback)
+                    {
+                        var command = new Command.Builder()
+                            .Service(TAP_CLOUDSAVE_SERVICE)
+                            .Method("unregisterCloudSaveCallback")
+                            .Callback(false)
+                            .OnceTime(false);
+                        EngineBridge.GetInstance().CallHandler(command.CommandBuilder());
+                        hasRegisteredNativeCallback = false;
+                        TapLog.Log("[TapCloudSaveBridge] Unregistered native callback");
+                    }
+                }
+                else
+                {
+                    TapLog.Log("[TapCloudSaveBridge] Callback not found");
+                }
+            }
+        }
+
+        private void InitRegisterNativeCallback()
+        {
+            if (hasRegisteredNativeCallback)
+            {
+                return;
+            }
+            hasRegisteredNativeCallback = true;
+
+            var command = new Command.Builder()
                 .Service(TAP_CLOUDSAVE_SERVICE)
                 .Method("registerCloudSaveCallback")
                 .Callback(true)
-                .OnceTime(true)
-                .CommandBuilder(), (response) =>
+                .OnceTime(false);
+            
+            EngineBridge.GetInstance().CallHandler(command.CommandBuilder(), (response) =>
             {
-                if (callback == null) return;
+                TapLog.Log($"[TapCloudSaveBridge] Native callback received: code={response.code}, content={response.content}");
+
+                if (callbacks.Count == 0) return;
 
                 try
                 {
-                    if (response.code != Result.RESULT_SUCCESS || string.IsNullOrEmpty(response.content))
-                    {
-                        callback.OnResult(-1);
-                        return;
-                    }
+                    int resultCode = -1;
 
-                    var result = JsonConvert.DeserializeObject<TapEngineBridgeResult>(response.content);
-                    if (result != null && result.code == TapEngineBridgeResult.RESULT_SUCCESS)
+                    // 修复：始终尝试解析content中的resultCode，不要因为response.code失败就跳过
+                    // iOS端会在TapSDKResult.content中传递真实的错误码（如300001 NEED_LOGIN）
+                    if (!string.IsNullOrEmpty(response.content))
                     {
-                        var resultCode = JsonConvert.DeserializeObject<int>(result.content);
-                        if (resultCode != null)
+                        try
                         {
-                            callback.OnResult(resultCode);
+                            var result = JsonConvert.DeserializeObject<TapEngineBridgeResult>(response.content);
+                            if (result != null && !string.IsNullOrEmpty(result.content))
+                            {
+                                // 尝试解析为字典（iOS格式：{"resultCode": 300001}）
+                                try
+                                {
+                                    var dataDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(result.content);
+                                    if (dataDict != null && dataDict.ContainsKey("resultCode"))
+                                    {
+                                        resultCode = SafeDictionary.GetValue<int>(dataDict, "resultCode", -1);
+                                        TapLog.Log($"[TapCloudSaveBridge] Parsed resultCode from dictionary: {resultCode}");
+                                    }
+                                    else
+                                    {
+                                        // 尝试直接解析为int（兼容旧格式）
+                                        resultCode = JsonConvert.DeserializeObject<int>(result.content);
+                                        TapLog.Log($"[TapCloudSaveBridge] Parsed resultCode directly: {resultCode}");
+                                    }
+                                }
+                                catch
+                                {
+                                    // 如果无法解析为字典，尝试直接解析为int
+                                    resultCode = JsonConvert.DeserializeObject<int>(result.content);
+                                    TapLog.Log($"[TapCloudSaveBridge] Parsed resultCode as int: {resultCode}");
+                                }
+                            }
                         }
-                        else
+                        catch (Exception parseEx)
                         {
-                            callback.OnResult(-1);
+                            TapLog.Error($"[TapCloudSaveBridge] Failed to parse TapEngineBridgeResult: {parseEx.Message}, using -1");
+                            resultCode = -1;
                         }
                     }
                     else
                     {
-                        callback.OnResult(-1);
+                        TapLog.Error("[TapCloudSaveBridge] Response content is null or empty, using -1");
+                    }
+
+                    TapLog.Log($"[TapCloudSaveBridge] Final resultCode: {resultCode}");
+
+                    // 通知所有已注册的callback
+                    foreach (var callback in callbacks)
+                    {
+                        try
+                        {
+                            callback?.OnResult(resultCode);
+                        }
+                        catch (Exception e)
+                        {
+                            TapLog.Log($"[TapCloudSaveBridge] Error in callback execution: {e.Message}");
+                        }
                     }
                 }
                 catch (Exception e)
                 {
-                    callback.OnResult(-1);
+                    TapLog.Log($"[TapCloudSaveBridge] Error processing native callback: {e.Message}");
+
+                    // 即使解析错误，也要通知所有callback
+                    foreach (var callback in callbacks)
+                    {
+                        try
+                        {
+                            callback?.OnResult(-1);
+                        }
+                        catch (Exception callbackException)
+                        {
+                            TapLog.Log($"[TapCloudSaveBridge] Error in callback execution during error handling: {callbackException.Message}");
+                        }
+                    }
                 }
             });
+            
+            TapLog.Log("[TapCloudSaveBridge] Initialized native callback registration");
         }
 
         public Task<ArchiveData> CreateArchive(ArchiveMetadata metadata, string archiveFilePath, string archiveCoverPath)
@@ -268,58 +385,78 @@ namespace TapSDK.CloudSave.Mobile
 
         public Task<List<ArchiveData>> GetArchiveList()
         {
-            TapLog.Log("[TapCloudSaveBridge] GetArchiveList called with Task<List<ArchiveData>> return type (NEW API)");
+            TapLog.Log("[TapCloudSaveBridge] 🚀 GetArchiveList called - Starting archive list request");
+            TapLog.Log($"[TapCloudSaveBridge] 📋 Service: {TAP_CLOUDSAVE_SERVICE}, Method: getArchiveList");
+            
             var taskSource = new TaskCompletionSource<List<ArchiveData>>();
-            EngineBridge.GetInstance().CallHandler(new Command.Builder()
+            var command = new Command.Builder()
                 .Service(TAP_CLOUDSAVE_SERVICE)
                 .Method("getArchiveList")
                 .Callback(true)
                 .OnceTime(true)
-                .CommandBuilder(), (response) =>
+                .CommandBuilder();
+                
+            TapLog.Log($"[TapCloudSaveBridge] 📤 Sending command to iOS: {command.ToJSON()}");
+            
+            EngineBridge.GetInstance().CallHandler(command, (response) =>
             {
+                TapLog.Log($"[TapCloudSaveBridge] 📥 Received response from iOS - Code: {response.code}, Content length: {response.content?.Length ?? 0}");
+                
                 try
                 {
                     if (response.code != Result.RESULT_SUCCESS || string.IsNullOrEmpty(response.content))
                     {
+                        TapLog.Log($"[TapCloudSaveBridge] ❌ Response failed - Code: {response.code}, Content: {response.content}");
                         taskSource.TrySetException(new TapException(-1, "Failed to get archive list: code="+response.code + " content="+response.content));
                         return;
                     }
                     
+                    TapLog.Log($"[TapCloudSaveBridge] 🔍 Parsing response content: {response.content.Substring(0, Math.Min(200, response.content.Length))}...");
+                    
                     var result = JsonConvert.DeserializeObject<TapEngineBridgeResult>(response.content);
                     if (result != null && result.code == TapEngineBridgeResult.RESULT_SUCCESS)
                     {
+                        TapLog.Log($"[TapCloudSaveBridge] ✅ Bridge result successful, parsing archive list content: {result.content?.Substring(0, Math.Min(100, result.content?.Length ?? 0))}...");
+                        
                         var archiveList = JsonConvert.DeserializeObject<List<ArchiveData>>(result.content);
                         if (archiveList != null)
                         {
+                            TapLog.Log($"[TapCloudSaveBridge] 🎉 Successfully parsed {archiveList.Count} archives, completing task");
                             taskSource.TrySetResult(archiveList);
                         }
                         else
                         {
+                            TapLog.Log($"[TapCloudSaveBridge] ❌ Failed to deserialize archive list from content: {result.content}");
                             taskSource.TrySetException(new TapException(-1, "json convert failed: content="+result.content));
                         }
                     }
                     else
                     {
+                        TapLog.Log($"[TapCloudSaveBridge] ❌ Bridge result failed - Code: {result?.code}, Content: {result?.content}");
                         try
                         {
                             var errorResponse = JsonConvert.DeserializeObject<ErrorResponse>(result.content);
                             if (errorResponse != null)
                             {
+                                TapLog.Log($"[TapCloudSaveBridge] 📋 Parsed error response - Code: {errorResponse.ErrorCode}, Message: {errorResponse.ErrorMessage}");
                                 taskSource.TrySetException(new TapException(errorResponse.ErrorCode, errorResponse.ErrorMessage));
                             }
                             else
                             {
+                                TapLog.Log("[TapCloudSaveBridge] ❌ Failed to parse error response, raw content: " + response.content);
                                 taskSource.TrySetException(new TapException(-1, "Failed to get archive list: content="+response.content));
                             }
                         }
                         catch (Exception e)
                         {
+                            TapLog.Log($"[TapCloudSaveBridge] ❌ Exception while parsing error response: {e.Message}");
                             taskSource.TrySetException(new TapException(-1, "Failed to get archive list: content="+response.content));
                         }
                     }
                 }
                 catch (Exception e)
                 {
+                    TapLog.Log($"[TapCloudSaveBridge] ❌ Top-level exception while processing response: {e.Message}");
                     taskSource.TrySetException(new TapException(-1, "Failed to get archive list: error=" + e.Message + ", content=" + response.content));
                 }
             });

package/Runtime/Internal/ITapCloudSaveBridge.cs

@@ -11,6 +11,8 @@ namespace TapSDK.CloudSave.Internal
 
         void RegisterCloudSaveCallback(ITapCloudSaveCallback callback);
 
+        void UnregisterCloudSaveCallback(ITapCloudSaveCallback callback);
+
         Task<ArchiveData> CreateArchive(ArchiveMetadata metadata, string archiveFilePath, string archiveCoverPath);
 
         Task<ArchiveData> UpdateArchive(string archiveUuid, ArchiveMetadata metadata, string archiveFilePath, string archiveCoverPath);

package/Runtime/Internal/TapTapCloudSaveInternal.cs

@@ -26,6 +26,11 @@ namespace TapSDK.CloudSave.Internal
             Bridge?.RegisterCloudSaveCallback(callback);
         }
 
+        internal static void UnregisterCloudSaveCallback(ITapCloudSaveCallback callback)
+        {
+            Bridge?.UnregisterCloudSaveCallback(callback);
+        }
+
         internal static Task<ArchiveData> CreateArchive(ArchiveMetadata metadata, string archiveFilePath, string archiveCoverPath) =>
             Bridge?.CreateArchive(metadata, archiveFilePath, archiveCoverPath);
 

package/Runtime/Public/TapTapCloudSave.cs

@@ -7,13 +7,18 @@ namespace TapSDK.CloudSave
 {
     public class TapTapCloudSave
     {
-        public static readonly string Version = "4.8.4-beta.0";
+        public static readonly string Version = "4.8.4";
 
         public static void RegisterCloudSaveCallback(ITapCloudSaveCallback callback)
         {
             TapTapCloudSaveInternal.RegisterCloudSaveCallback(callback);
         }
 
+        public static void UnregisterCloudSaveCallback(ITapCloudSaveCallback callback)
+        {
+            TapTapCloudSaveInternal.UnregisterCloudSaveCallback(callback);
+        }
+
         public static Task<ArchiveData> CreateArchive(ArchiveMetadata metadata, string archiveFilePath, string archiveCoverPath) =>
             TapTapCloudSaveInternal.CreateArchive(metadata, archiveFilePath, archiveCoverPath);
 

package/Standalone/Runtime/TapCloudSaveStandalone.cs

@@ -462,7 +462,6 @@ namespace TapSDK.CloudSave.Standalone
 
         public void RegisterCloudSaveCallback(ITapCloudSaveCallback callback)
         {
-            currentSaveCallback?.Clear();
             string seesionId = Guid.NewGuid().ToString();
             const string method = "registerCloudSaveCallback";
             TapCloudSaveTracker.Instance.TrackStart(method, seesionId);
@@ -474,6 +473,7 @@ namespace TapSDK.CloudSave.Standalone
             {
                 TapCloudSaveTracker.Instance.TrackSuccess(method, seesionId);
                 currentSaveCallback.Add(callback);
+                Log($"RegisterCloudSaveCallback: Added callback. Total callbacks: {currentSaveCallback.Count}");
             }
             else
             {
@@ -482,6 +482,42 @@ namespace TapSDK.CloudSave.Standalone
                     seesionId,
                     errorMessage: "callback has already registered"
                 );
+                Log("RegisterCloudSaveCallback: Callback already registered");
+            }
+        }
+
+        public void UnregisterCloudSaveCallback(ITapCloudSaveCallback callback)
+        {
+            string seesionId = Guid.NewGuid().ToString();
+            const string method = "unregisterCloudSaveCallback";
+            TapCloudSaveTracker.Instance.TrackStart(method, seesionId);
+            
+            if (currentSaveCallback != null && callback != null)
+            {
+                if (currentSaveCallback.Contains(callback))
+                {
+                    currentSaveCallback.Remove(callback);
+                    TapCloudSaveTracker.Instance.TrackSuccess(method, seesionId);
+                    Log($"UnregisterCloudSaveCallback: Removed callback. Remaining callbacks: {currentSaveCallback.Count}");
+                }
+                else
+                {
+                    TapCloudSaveTracker.Instance.TrackFailure(
+                        method,
+                        seesionId,
+                        errorMessage: "callback not found"
+                    );
+                    Log("UnregisterCloudSaveCallback: Callback not found");
+                }
+            }
+            else
+            {
+                TapCloudSaveTracker.Instance.TrackFailure(
+                    method,
+                    seesionId,
+                    errorMessage: "callback or callback list is null"
+                );
+                Log("UnregisterCloudSaveCallback: Callback or callback list is null");
             }
         }
 

package/package.json

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

package/link.xml

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

package/link.xml.meta

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