com.taptap.sdk.cloudsave 4.8.0-beta.1 → 4.8.1-beta.1

package/Mobile/Editor/NativeDependencies.xml

@@ -4,6 +4,12 @@
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-cloudsave-unity:4.8.0-beta.1"/>
+    <androidPackage spec="com.taptap.sdk:tap-cloudsave-unity:4.8.1-beta.1"/>
   </androidPackages>
+  <iosPods>
+    <sources>
+      <source>https://github.com/CocoaPods/Specs.git</source>
+    </sources>
+    <iosPod name="TapTapCloudSaveSDK" version="~> 4.8.1-beta.1" bitcodeEnabled="false" addToAllTargets="false"/>
+  </iosPods>
 </dependencies>

package/Mobile/Runtime/TapCloudSaveBridge.cs

@@ -6,6 +6,12 @@ using TapSDK.CloudSave.Internal;
 
 namespace TapSDK.CloudSave.Mobile
 {
+    public class ErrorResponse
+    {
+        [JsonProperty("errorCode")] public int ErrorCode { get; set; }
+        [JsonProperty("errorMessage")] public string ErrorMessage { get; set; }
+    }
+
     public class TapCloudSaveBridge : ITapCloudSaveBridge
     {
         public static string TAP_CLOUDSAVE_SERVICE = "BridgeCloudSaveService";
@@ -19,6 +25,11 @@ namespace TapSDK.CloudSave.Mobile
             EngineBridge.GetInstance().Register(TDS_CLOUDSAVE_SERVICE_CLZ, TDS_CLOUDSAVE_SERVICE_IMPL);
         }
 
+        public void Init(TapTapSdkOptions options)
+        {
+            // 原生由原生内部实现
+        }
+
         public void RegisterCloudSaveCallback(ITapCloudSaveCallback callback)
         {
             EngineBridge.GetInstance().CallHandler(new Command.Builder()
@@ -37,7 +48,7 @@ namespace TapSDK.CloudSave.Mobile
                         callback.OnResult(-1);
                         return;
                     }
-                    
+
                     var result = JsonConvert.DeserializeObject<TapEngineBridgeResult>(response.content);
                     if (result != null && result.code == TapEngineBridgeResult.RESULT_SUCCESS)
                     {
@@ -63,12 +74,12 @@ namespace TapSDK.CloudSave.Mobile
             });
         }
 
-        public void CreateArchive(string metadata, string archiveFilePath, string archiveCoverPath, ITapCloudSaveRequestCallback callback)
+        public void CreateArchive(ArchiveMetadata metadata, string archiveFilePath, string archiveCoverPath, ITapCloudSaveRequestCallback callback)
         {
             EngineBridge.GetInstance().CallHandler(new Command.Builder()
                 .Service(TAP_CLOUDSAVE_SERVICE)
                 .Method("createArchive")
-                .Args("archiveMetadata",  metadata)
+                .Args("archiveMetadata",  JsonConvert.SerializeObject(metadata))
                 .Args("archiveFilePath",  archiveFilePath)
                 .Args("archiveCoverPath",  archiveCoverPath)
                 .Callback(true)
@@ -100,7 +111,22 @@ namespace TapSDK.CloudSave.Mobile
                     }
                     else
                     {
-                        callback.OnRequestError(-1, "Failed to create archive: content="+response.content);
+                        try
+                        {
+                            var errorResponse = JsonConvert.DeserializeObject<ErrorResponse>(result.content);
+                            if (errorResponse != null)
+                            {
+                                callback.OnRequestError(errorResponse.ErrorCode, errorResponse.ErrorMessage);
+                            }
+                            else
+                            {
+                                callback.OnRequestError(-1, "Failed to create archive: content="+response.content);
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            callback.OnRequestError(-1, "Failed to create archive: content="+response.content);
+                        }
                     }
                 }
                 catch (Exception e)
@@ -110,15 +136,15 @@ namespace TapSDK.CloudSave.Mobile
             });
         }
         
-        public void UpdateArchive(string archiveUuid, string metadata, string archiveFilePath, string archiveCoverPath, ITapCloudSaveRequestCallback callback)
+        public void UpdateArchive(string archiveUuid, ArchiveMetadata metadata, string archiveFilePath, string archiveCoverPath, ITapCloudSaveRequestCallback callback)
         {
             EngineBridge.GetInstance().CallHandler(new Command.Builder()
                 .Service(TAP_CLOUDSAVE_SERVICE)
                 .Method("updateArchive")
-                .Args("archiveUUID",  archiveUuid)
-                .Args("archiveMetadata",  metadata)
-                .Args("archiveFilePath",  archiveFilePath)
-                .Args("archiveCoverPath",  archiveCoverPath)
+                .Args("archiveUUIDForUpdate",  archiveUuid)
+                .Args("archiveMetadataForUpdate",  JsonConvert.SerializeObject(metadata))
+                .Args("archiveFilePathForUpdate",  archiveFilePath)
+                .Args("archiveCoverPathForUpdate",  archiveCoverPath)
                 .Callback(true)
                 .OnceTime(true)
                 .CommandBuilder(), (response) =>
@@ -148,7 +174,22 @@ namespace TapSDK.CloudSave.Mobile
                     }
                     else
                     {
-                        callback.OnRequestError(-1, "Failed to update archive: content="+response.content);
+                        try
+                        {
+                            var errorResponse = JsonConvert.DeserializeObject<ErrorResponse>(result.content);
+                            if (errorResponse != null)
+                            {
+                                callback.OnRequestError(errorResponse.ErrorCode, errorResponse.ErrorMessage);
+                            }
+                            else
+                            {
+                                callback.OnRequestError(-1, "Failed to update archive: content="+response.content);
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            callback.OnRequestError(-1, "Failed to update archive: content="+response.content);
+                        }
                     }
                 }
                 catch (Exception e)
@@ -193,7 +234,22 @@ namespace TapSDK.CloudSave.Mobile
                     }
                     else
                     {
-                        callback.OnRequestError(-1, "Failed to delete archive: content="+response.content);
+                        try
+                        {
+                            var errorResponse = JsonConvert.DeserializeObject<ErrorResponse>(result.content);
+                            if (errorResponse != null)
+                            {
+                                callback.OnRequestError(errorResponse.ErrorCode, errorResponse.ErrorMessage);
+                            }
+                            else
+                            {
+                                callback.OnRequestError(-1, "Failed to delete archive: content="+response.content);
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            callback.OnRequestError(-1, "Failed to delete archive: content="+response.content);
+                        }
                     }
                 }
                 catch (Exception e)
@@ -237,7 +293,22 @@ namespace TapSDK.CloudSave.Mobile
                     }
                     else
                     {
-                        callback.OnRequestError(-1, "Failed to get archive list: content="+response.content);
+                        try
+                        {
+                            var errorResponse = JsonConvert.DeserializeObject<ErrorResponse>(result.content);
+                            if (errorResponse != null)
+                            {
+                                callback.OnRequestError(errorResponse.ErrorCode, errorResponse.ErrorMessage);
+                            }
+                            else
+                            {
+                                callback.OnRequestError(-1, "Failed to get archive list: content="+response.content);
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            callback.OnRequestError(-1, "Failed to get archive list: content="+response.content);
+                        }
                     }
                 }
                 catch (Exception e)
@@ -283,7 +354,22 @@ namespace TapSDK.CloudSave.Mobile
                     }
                     else
                     {
-                        callback.OnRequestError(-1, "Failed to convert base64 data: content="+response.content);
+                        try
+                        {
+                            var errorResponse = JsonConvert.DeserializeObject<ErrorResponse>(result.content);
+                            if (errorResponse != null)
+                            {
+                                callback.OnRequestError(errorResponse.ErrorCode, errorResponse.ErrorMessage);
+                            }
+                            else
+                            {
+                                callback.OnRequestError(-1, "Failed to get archive data: content="+response.content);
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            callback.OnRequestError(-1, "Failed to get archive data: content="+response.content);
+                        }
                     }
                 }
                 catch (Exception e)
@@ -298,8 +384,8 @@ namespace TapSDK.CloudSave.Mobile
             EngineBridge.GetInstance().CallHandler(new Command.Builder()
                 .Service(TAP_CLOUDSAVE_SERVICE)
                 .Method("getArchiveCover")
-                .Args("archiveUUID",  archiveUuid)
-                .Args("archiveFileID",  archiveFileId)
+                .Args("archiveUUIDForCover",  archiveUuid)
+                .Args("archiveFileIDForCover",  archiveFileId)
                 .Callback(true)
                 .OnceTime(true)
                 .CommandBuilder(), (response) =>
@@ -329,7 +415,22 @@ namespace TapSDK.CloudSave.Mobile
                     }
                     else
                     {
-                        callback.OnRequestError(-1, "Failed to convert base64 data: content="+response.content);
+                        try
+                        {
+                            var errorResponse = JsonConvert.DeserializeObject<ErrorResponse>(result.content);
+                            if (errorResponse != null)
+                            {
+                                callback.OnRequestError(errorResponse.ErrorCode, errorResponse.ErrorMessage);
+                            }
+                            else
+                            {
+                                callback.OnRequestError(-1, "Failed to get archive cover: content="+response.content);
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            callback.OnRequestError(-1, "Failed to get archive cover: content="+response.content);
+                        }
                     }
                 }
                 catch (Exception e)

package/Runtime/Internal/ITapCloudSaveBridge.cs

@@ -1,13 +1,17 @@
-namespace TapSDK.CloudSave.Internal
+using TapSDK.Core;
+
+namespace TapSDK.CloudSave.Internal
 {
     public interface ITapCloudSaveBridge
     {
+        void Init(TapTapSdkOptions options);
+
         void RegisterCloudSaveCallback(ITapCloudSaveCallback callback);
 
-        void CreateArchive(string metadata, string archiveFilePath, string archiveCoverPath,
+        void CreateArchive(ArchiveMetadata metadata, string archiveFilePath, string archiveCoverPath,
             ITapCloudSaveRequestCallback callback);
 
-        void UpdateArchive(string archiveUuid, string metadata, string archiveFilePath, string archiveCoverPath,
+        void UpdateArchive(string archiveUuid, ArchiveMetadata metadata, string archiveFilePath, string archiveCoverPath,
             ITapCloudSaveRequestCallback callback);
 
         void DeleteArchive(string archiveUuid, ITapCloudSaveRequestCallback callback);

package/Runtime/Internal/TapCloudSaveInitTask.cs

@@ -9,10 +9,12 @@ namespace TapSDK.CloudSave.Internal.Init
 
         public void Init(TapTapSdkOptions coreOption)
         {
+            TapTapCloudSaveInternal.Init(coreOption);
         }
 
         public void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions)
         {
+            TapTapCloudSaveInternal.Init(coreOption);
         }
     }
 }

package/Runtime/Internal/TapTapCloudSaveInternal.cs

@@ -1,3 +1,4 @@
+using TapSDK.Core;
 using TapSDK.Core.Internal.Utils;
 
 namespace TapSDK.CloudSave.Internal
@@ -11,19 +12,24 @@ namespace TapSDK.CloudSave.Internal
             Bridge = BridgeUtils.CreateBridgeImplementation(typeof(ITapCloudSaveBridge), "TapSDK.CloudSave")
                 as ITapCloudSaveBridge;
         }
-        
+
+        internal static void Init(TapTapSdkOptions options)
+        {
+            Bridge?.Init(options);
+        }
+
         internal static void RegisterCloudSaveCallback(ITapCloudSaveCallback callback)
         {
             Bridge?.RegisterCloudSaveCallback(callback);
         }
 
-        internal static void CreateArchive(string metadata, string archiveFilePath, string archiveCoverPath,
+        internal static void CreateArchive(ArchiveMetadata metadata, string archiveFilePath, string archiveCoverPath,
             ITapCloudSaveRequestCallback callback)
         {
             Bridge?.CreateArchive(metadata, archiveFilePath, archiveCoverPath, callback);
         }
 
-        internal static void UpdateArchive(string archiveUuid, string metadata, string archiveFilePath,
+        internal static void UpdateArchive(string archiveUuid, ArchiveMetadata metadata, string archiveFilePath,
             string archiveCoverPath, ITapCloudSaveRequestCallback callback)
         {
             Bridge?.UpdateArchive(archiveUuid, metadata, archiveFilePath, archiveCoverPath, callback);

package/Runtime/Public/TapTapCloudSave.cs

@@ -4,18 +4,20 @@ namespace TapSDK.CloudSave
 {
     public class TapTapCloudSave
     {
+        public static readonly string Version = "4.8.1-beta.1";
+
         public static void RegisterCloudSaveCallback(ITapCloudSaveCallback callback)
         {
             TapTapCloudSaveInternal.RegisterCloudSaveCallback(callback);
         }
 
-        public static void CreateArchive(string metadata, string archiveFilePath, string archiveCoverPath,
+        public static void CreateArchive(ArchiveMetadata metadata, string archiveFilePath, string archiveCoverPath,
             ITapCloudSaveRequestCallback callback)
         {
             TapTapCloudSaveInternal.CreateArchive(metadata, archiveFilePath, archiveCoverPath, callback);
         }
 
-        public static void UpdateArchive(string archiveUuid, string metadata, string archiveFilePath,
+        public static void UpdateArchive(string archiveUuid, ArchiveMetadata metadata, string archiveFilePath,
             string archiveCoverPath, ITapCloudSaveRequestCallback callback)
         {
             TapTapCloudSaveInternal.UpdateArchive(archiveUuid, metadata, archiveFilePath, archiveCoverPath, callback);

package/Standalone/Editor/TapCloudSaveStandaloneProcessBuild.cs

@@ -0,0 +1,26 @@
+using System;
+using TapSDK.Core.Editor;
+using UnityEditor.Build.Reporting;
+
+namespace TapSDK.CloudSave.Standalone.Editor
+{
+    public class TapCloudSaveStandaloneProcessBuild : SDKLinkProcessBuild
+    {
+        public override int callbackOrder => 0;
+
+        public override string LinkPath => "TapSDK/CloudSave/link.xml";
+
+        public override LinkedAssembly[] LinkedAssemblies =>
+            new LinkedAssembly[]
+            {
+                new LinkedAssembly { Fullname = "TapSDK.CloudSave.Runtime" },
+                new LinkedAssembly { Fullname = "TapSDK.CloudSave.Standalone.Runtime" },
+            };
+
+        public override Func<BuildReport, bool> IsTargetPlatform =>
+            (report) =>
+            {
+                return BuildTargetUtils.IsSupportStandalone(report.summary.platform);
+            };
+    }
+}

package/Standalone/Editor/TapCloudSaveStandaloneProcessBuild.cs.meta

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

package/Standalone/Editor/TapSDK.CloudSave.Standalone.Editor.asmdef

@@ -0,0 +1,17 @@
+{
+    "name": "TapSDK.CloudSave.Standalone.Editor",
+    "references": [
+        "GUID:56f3da7a178484843974054bafe77e73"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

package/Standalone/Editor/TapSDK.CloudSave.Standalone.Editor.asmdef.meta

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

package/Standalone/Editor.meta

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

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

@@ -0,0 +1,80 @@
+fileFormatVersion: 2
+guid: ab1626c057f474478a7240f424e355cd
+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: 0
+        Exclude OSXUniversal: 0
+        Exclude Win: 0
+        Exclude Win64: 0
+        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: x86_64
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: Win
+    second:
+      enabled: 1
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        AddToEmbeddedBinaries: false
+        CPU: AnyCPU
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Standalone/Plugins/x86_64.meta

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

package/Standalone/Plugins.meta

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

package/Standalone/Runtime/Internal/TapCloudSaveArchiveListResponse.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace TapSDK.CloudSave.Standalone
+{
+    internal class TapCloudSaveArchiveListResponse
+    {
+        [JsonProperty("saves")]
+        public List<ArchiveData> saves { get; set; }
+    }
+}

package/Standalone/Runtime/Internal/TapCloudSaveArchiveListResponse.cs.meta

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

package/Standalone/Runtime/Internal/TapCloudSaveBaseResponse.cs

@@ -0,0 +1,29 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace TapSDK.CloudSave.Standalone
+{
+    internal class TapCloudSaveBaseResponse
+    {
+        [JsonProperty("success")]
+        public bool success { get; set; }
+
+        [JsonProperty("now")]
+        public int now { get; set; }
+
+        [JsonProperty("data")]
+        public JObject data { get; set; }
+    }
+
+    internal class TapCloudSaveError
+    {
+        [JsonProperty("code")]
+        public int code { get; set; }
+
+        [JsonProperty("msg")]
+        public string msg { get; set; }
+
+        [JsonProperty("error")]
+        public string error { get; set; }
+    }
+}

package/Standalone/Runtime/Internal/TapCloudSaveBaseResponse.cs.meta

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

package/Standalone/Runtime/Internal/TapCloudSaveTracker.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using TapSDK.Core.Standalone.Internal.Openlog;
+
+namespace TapSDK.CloudSave.Standalone
+{
+    internal class TapCloudSaveTracker
+    {
+        private const string ACTION_INIT = "init";
+        private const string ACTION_START = "start";
+        private const string ACTION_SUCCESS = "success";
+        private const string ACTION_FAIL = "fail";
+
+        private static TapCloudSaveTracker instance;
+
+        private TapOpenlogStandalone openlog;
+
+        private TapCloudSaveTracker()
+        {
+            openlog = new TapOpenlogStandalone("TapCloudSave", TapTapCloudSave.Version);
+        }
+
+        public static TapCloudSaveTracker Instance
+        {
+            get
+            {
+                if (instance == null)
+                {
+                    instance = new TapCloudSaveTracker();
+                }
+                return instance;
+            }
+        }
+
+        internal void TrackInit()
+        {
+            ReportLog(ACTION_INIT);
+        }
+
+        internal void TrackStart(string funcNace, string seesionId)
+        {
+            Dictionary<string, string> parameters = new Dictionary<string, string>
+            {
+                { "func_name", funcNace },
+                { "session_id", seesionId },
+            };
+            ReportLog(
+                ACTION_START,
+                new Dictionary<string, string>()
+                {
+                    { "args", JsonConvert.SerializeObject(parameters) },
+                }
+            );
+        }
+
+        internal void TrackSuccess(string funcNace, string seesionId)
+        {
+            Dictionary<string, string> parameters = new Dictionary<string, string>
+            {
+                { "func_name", funcNace },
+                { "session_id", seesionId },
+            };
+            ReportLog(
+                ACTION_SUCCESS,
+                new Dictionary<string, string>()
+                {
+                    { "args", JsonConvert.SerializeObject(parameters) },
+                }
+            );
+        }
+
+        internal void TrackFailure(
+            string funcNace,
+            string seesionId,
+            int errorCode = -1,
+            string errorMessage = null
+        )
+        {
+            Dictionary<string, string> parameters = new Dictionary<string, string>
+            {
+                { "func_name", funcNace },
+                { "session_id", seesionId },
+                { "error_code", errorCode.ToString() },
+                { "error_msg", errorMessage },
+            };
+            ReportLog(
+                ACTION_FAIL,
+                new Dictionary<string, string>()
+                {
+                    { "args", JsonConvert.SerializeObject(parameters) },
+                }
+            );
+        }
+
+        private void ReportLog(string action, Dictionary<string, string> parameters = null)
+        {
+            openlog.LogBusiness(action, parameters);
+        }
+    }
+}