com.taptap.sdk.login 4.8.4-beta.1 → 4.8.4-beta.2

package/Mobile/Editor/NativeDependencies.xml

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <dependencies>
   <androidPackages>
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-login-unity:4.8.4"/>
+    <androidPackage spec="com.taptap.sdk:tap-login-unity:4.8.4" />
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
-    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapSDK/Login" version="4.8.4"/>
+    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapSDK/Login" version="4.8.4" />
   </iosPods>
 </dependencies>

package/Mobile/Editor/TapLoginIOSProcessor.cs

@@ -11,81 +11,139 @@ using UnityEngine;
 namespace TapSDK.Login.Editor
 {
 #if UNITY_IOS || UNITY_STANDALONE_OSX
+    /// <summary>
+    /// TapTap Login iOS/macOS 平台构建后处理器
+    /// 用于在 Unity 构建完成后自动配置 Xcode 项目：
+    /// 1. 合并 TDS-Info.plist 配置到应用的 Info.plist
+    /// 2. 添加 TapTapLoginResource.bundle 资源包到 Xcode 项目
+    /// </summary>
     public static class TapLoginIOSProcessor
     {
-        // 添加标签，unity导出工程后自动执行该函数
+        #region Constants
+
+        /// <summary>TapSDK 配置文件名</summary>
+        private const string TDS_INFO_PLIST_NAME = "TDS-Info.plist";
+
+        /// <summary>TapSDK 配置文件搜索路径（相对于项目根目录）</summary>
+        private const string TDS_INFO_SEARCH_PATH = "/Assets/Plugins/";
+
+        /// <summary>TapTap Login 资源包名称</summary>
+        private const string LOGIN_RESOURCE_BUNDLE_NAME = "TapTapLoginResource";
+
+        /// <summary>TapTap Login 包标识符</summary>
+        private const string LOGIN_PACKAGE_ID = "com.taptap.sdk.login";
+
+        /// <summary>TapTap Login 模块名称</summary>
+        private const string LOGIN_MODULE_NAME = "Login";
+
+        /// <summary>TapTap Login 资源包文件名</summary>
+        private const string LOGIN_RESOURCE_BUNDLE_FILE = "TapTapLoginResource.bundle";
+
+        /// <summary>Xcode 项目文件扩展名</summary>
+        private const string XCODE_PROJECT_EXTENSION = ".xcodeproj";
+
+        /// <summary>Xcode 项目配置文件名</summary>
+        private const string XCODE_PROJECT_FILE = "project.pbxproj";
+
+        #endregion
+
+        /// <summary>
+        /// Unity 构建后处理回调
+        /// 在 iOS 或 macOS 平台构建完成后自动执行，配置 Xcode 项目
+        /// </summary>
+        /// <param name="buildTarget">构建目标平台</param>
+        /// <param name="path">构建输出路径（iOS 为 Xcode 项目目录，macOS 为 .app 路径）</param>
         [PostProcessBuild(103)]
         public static void OnPostprocessBuild(BuildTarget buildTarget, string path)
         {
-            var parentFolder = Directory.GetParent(Application.dataPath)?.FullName;
+            // 只处理 iOS 和 macOS 平台
+            if (buildTarget != BuildTarget.iOS && buildTarget != BuildTarget.StandaloneOSX)
+            {
+                return;
+            }
 
-            var plistFile = TapFileHelper.RecursionFilterFile(parentFolder + "/Assets/Plugins/", "TDS-Info.plist");
+            // 查找 TDS-Info.plist 配置文件
+            var parentFolder = Directory.GetParent(Application.dataPath)?.FullName;
+            var plistSearchPath = parentFolder + TDS_INFO_SEARCH_PATH;
+            var plistFile = TapFileHelper.RecursionFilterFile(plistSearchPath, TDS_INFO_PLIST_NAME);
 
             if (plistFile == null || !plistFile.Exists)
             {
-                Debug.LogError("TapSDK Can't find TDS-Info.plist in Project/Assets/Plugins/!");
+                Debug.LogError($"TapSDK Can't find {TDS_INFO_PLIST_NAME} in {plistSearchPath}!");
+                return;
             }
 
-
-            if (buildTarget is BuildTarget.iOS)
+            // 处理 iOS 平台
+            if (buildTarget == BuildTarget.iOS)
             {
 #if UNITY_IOS
-                TapSDKCoreCompile.HandlerPlist(Path.GetFullPath(path), plistFile?.FullName ?? null);
+                // 合并 TDS-Info.plist 到 iOS 应用的 Info.plist
+                TapSDKCoreCompile.HandlerPlist(Path.GetFullPath(path), plistFile.FullName);
+
+                // 添加 TapTapLoginResource.bundle 到 Xcode 项目
+                AddLoginResourceBundle(path);
 #endif
             }
-            else if (buildTarget is BuildTarget.StandaloneOSX)
+            // 处理 macOS 平台
+            else if (buildTarget == BuildTarget.StandaloneOSX)
             {
-                Debug.Log($"path:{path}");
-                Debug.Log($"path:{Path.GetFullPath(path)}");
-                Debug.Log($"dir:{Path.GetDirectoryName(path)}");
-                Debug.Log($"dir:{Path.GetFileName(path)}");
-                // 获得工程路径
-#if UNITY_2020_1_OR_NEWER
-                var directory = Path.GetDirectoryName(path);
-                if (string.IsNullOrEmpty(directory))
-                {
-                    directory = "";
-                }
-
-                var fileName = Path.GetFileName(path);
-                if (!fileName.EndsWith(".xcodeproj"))
-                {
-                    fileName += ".xcodeproj";
-                }
-
-                var projPath = Path.Combine(directory, $"{fileName}/project.pbxproj");
-#elif UNITY_2019_1_OR_NEWER
-                var projPath = Path.Combine(path, "project.pbxproj");
-#else
-#endif
 #if UNITY_IOS
+                // 合并 TDS-Info.plist 到 macOS 应用的 Info.plist
                 TapSDKCoreCompile.HandlerPlist(Path.GetFullPath(path), plistFile.FullName, true);
 #endif
             }
-            
+        }
+
 #if UNITY_IOS
-            var projPath1 = TapSDKCoreCompile.GetProjPath(path);
-            var proj = TapSDKCoreCompile.ParseProjPath(projPath1);
-            var target = TapSDKCoreCompile.GetUnityTarget(proj);
-            if (TapSDKCoreCompile.CheckTarget(target))
+        /// <summary>
+        /// 将 TapTapLoginResource.bundle 添加到 iOS Xcode 项目
+        /// 包含登录界面所需的图片、文本等资源
+        /// </summary>
+        /// <param name="buildPath">Xcode 项目构建路径</param>
+        private static void AddLoginResourceBundle(string buildPath)
+        {
+            try
             {
-                Debug.LogError("Unity-iPhone is NUll");
-                return;
-            }
-            if (TapSDKCoreCompile.HandlerIOSSetting(path,
+                // 获取 Xcode 项目文件路径
+                var projPath = TapSDKCoreCompile.GetProjPath(buildPath);
+                var proj = TapSDKCoreCompile.ParseProjPath(projPath);
+
+                // 获取 Unity-iPhone target
+                var target = TapSDKCoreCompile.GetUnityTarget(proj);
+                if (TapSDKCoreCompile.CheckTarget(target))
+                {
+                    Debug.LogError("TapLogin: Unity-iPhone target is null, cannot add resource bundle");
+                    return;
+                }
+
+                // 添加资源包到 Xcode 项目
+                bool success = TapSDKCoreCompile.HandlerIOSSetting(
+                    buildPath,
                     Application.dataPath,
-                    "TapTapLoginResource",
-                    "com.taptap.sdk.login",
-                    "Login",
-                    new[] {"TapTapLoginResource.bundle"},
-                    target, projPath1, proj))
+                    LOGIN_RESOURCE_BUNDLE_NAME,
+                    LOGIN_PACKAGE_ID,
+                    LOGIN_MODULE_NAME,
+                    new[] { LOGIN_RESOURCE_BUNDLE_FILE },
+                    target,
+                    projPath,
+                    proj
+                );
+
+                if (success)
+                {
+                    Debug.Log($"TapLogin: Successfully added {LOGIN_RESOURCE_BUNDLE_FILE} to Xcode project");
+                }
+                else
+                {
+                    Debug.LogWarning($"TapLogin: Failed to add {LOGIN_RESOURCE_BUNDLE_FILE} to Xcode project");
+                }
+            }
+            catch (Exception ex)
             {
-                Debug.Log("TapLogin add Bundle Success!");
-                return;
+                Debug.LogError($"TapLogin: Exception while adding resource bundle: {ex.Message}");
             }
-            Debug.LogWarning("TapLogin add Bundle Failed!");
-#endif
         }
+#endif
     }
 #endif
 }

package/Mobile/Editor/TapLoginMobileProcessBuild.cs

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

package/Runtime/Public/TapTapLogin.cs

@@ -7,7 +7,7 @@ namespace TapSDK.Login
     public class TapTapLogin
     {
 
-        public static readonly string Version = "4.8.4-beta.1";
+        public static readonly string Version = "4.8.4";
 
         public const string TAP_LOGIN_SCOPE_BASIC_INFO = "basic_info";
         public const string TAP_LOGIN_SCOPE_PUBLIC_PROFILE = "public_profile";

package/Standalone/Editor/TapLoginStandaloneProcessBuild.cs

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

package/Standalone/Runtime/Internal2/Http/Response/ProfileResponse.cs

@@ -1,23 +1,23 @@
-using Newtonsoft.Json;
-
-namespace TapSDK.Login.Internal.Http {
-    public class ProfileData {
-        [JsonProperty("openid")]
-        public string OpenId { get; set; }
-
-        [JsonProperty("unionid")]
-        public string UnionId { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("gender")]
-        public string Gender { get; set; }
-
-        [JsonProperty("avatar")]
-        public string Avatar { get; set; }
-        
-        [JsonProperty("email")]
-        public string Email { get; set; }
-    }
-}
+using Newtonsoft.Json;
+
+namespace TapSDK.Login.Internal.Http {
+    public class ProfileData {
+        [JsonProperty("openid")]
+        public string OpenId { get; set; }
+
+        [JsonProperty("unionid")]
+        public string UnionId { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("gender")]
+        public string Gender { get; set; }
+
+        [JsonProperty("avatar")]
+        public string Avatar { get; set; }
+        
+        [JsonProperty("email")]
+        public string Email { get; set; }
+    }
+}

package/Standalone/Runtime/Internal2/Http/Response/QRCodeResponse.cs

@@ -1,17 +1,17 @@
-using Newtonsoft.Json;
-
-namespace TapSDK.Login.Internal.Http {
-    public class QRCodeData {
-        [JsonProperty("device_code")]
-        public string DeviceCode { get; set; }
-
-        [JsonProperty("expires_in")]
-        public int ExpiresIn { get; set; }
-
-        [JsonProperty("qrcode_url")]
-        public string Url { get; set; }
-
-        [JsonProperty("interval")]
-        public int Interval { get; set; }
-    }
+using Newtonsoft.Json;
+
+namespace TapSDK.Login.Internal.Http {
+    public class QRCodeData {
+        [JsonProperty("device_code")]
+        public string DeviceCode { get; set; }
+
+        [JsonProperty("expires_in")]
+        public int ExpiresIn { get; set; }
+
+        [JsonProperty("qrcode_url")]
+        public string Url { get; set; }
+
+        [JsonProperty("interval")]
+        public int Interval { get; set; }
+    }
 }

package/Standalone/Runtime/Internal2/Http/Response/TokenResponse.cs

@@ -1,28 +1,28 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace TapSDK.Login.Internal.Http {
-    public class TokenData {
-        [JsonProperty("kid")]
-        public string Kid { get; set; }
-
-        [JsonProperty("access_token")]
-        public string Token { get; set; }
-
-        [JsonProperty("token_type")]
-        public string TokenType { get; set; }
-
-        [JsonProperty("mac_key")]
-        public string MacKey { get; set; }
-
-        [JsonProperty("mac_algorithm")]
-        public string MacAlgorithm { get; set; }
-
-        [JsonProperty("scope")]
-        public string Scope { get; set; }
-
-        [JsonIgnore]
-        public HashSet<string> Scopes => !string.IsNullOrEmpty(Scope) ? 
-            new HashSet<string>(Scope.Split(' ')) : new HashSet<string>();
-    }
-}
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace TapSDK.Login.Internal.Http {
+    public class TokenData {
+        [JsonProperty("kid")]
+        public string Kid { get; set; }
+
+        [JsonProperty("access_token")]
+        public string Token { get; set; }
+
+        [JsonProperty("token_type")]
+        public string TokenType { get; set; }
+
+        [JsonProperty("mac_key")]
+        public string MacKey { get; set; }
+
+        [JsonProperty("mac_algorithm")]
+        public string MacAlgorithm { get; set; }
+
+        [JsonProperty("scope")]
+        public string Scope { get; set; }
+
+        [JsonIgnore]
+        public HashSet<string> Scopes => !string.IsNullOrEmpty(Scope) ? 
+            new HashSet<string>(Scope.Split(' ')) : new HashSet<string>();
+    }
+}