com.xd.sdk.account 7.3.4 → 7.6.1

package/Editor/Android/XDAccountAndroidGradleProcessor.cs

@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using XD.SDK.Foundation.Mobile.Editor;
+using XD.SDK.Foundation.Mobile.Editor.Android;
+
+namespace XD.SDK.Account.Editor
+{
+    public class XDAccountAndroidGradleProcessor : XDAndroidProjectProcessor
+    {
+        protected override List<AndroidGradleProjectConfig.Dependency> GenerateDependencies()
+        {
+            var sdkVersion = VersionCatalog.XDAndroidSdkVersion;
+            var result = new List<AndroidGradleProjectConfig.Dependency>
+            {
+                new AndroidGradleProjectConfig.Dependency(group: "com.xd.sdk.android", module: "account-bridge",
+                    version: sdkVersion),
+                new AndroidGradleProjectConfig.Dependency(group: "com.xd.sdk.android", module: "support",
+                    version: sdkVersion),
+            };
+
+            var regionType = configModel?.region_type;
+            if (string.Equals(regionType, "global", System.StringComparison.OrdinalIgnoreCase))
+            {
+                result.Add(new AndroidGradleProjectConfig.Dependency(group: "com.xd.sdk.android", module: "account-global",
+                    version: sdkVersion));
+            }
+            else if (string.Equals(regionType, "cn", System.StringComparison.OrdinalIgnoreCase))
+            {
+                result.Add(new AndroidGradleProjectConfig.Dependency(group: "com.xd.sdk.android", module: "account-cn",
+                    version: sdkVersion));
+            }
+
+            return result;
+        }
+    }
+}

package/Editor/Android/XDAccountAndroidGradleProcessor.cs.meta

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

package/{Plugins → Editor}/Android.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 58732c81d2494ed99ea8503943c66921
+guid: 906fa2426dfff47beb86c6feccd9c891
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

package/{Plugins/Android/libs.meta → Editor.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0e8d623d5ea147b3807cebee8455ab6a
+guid: fedd6c2bb601f46939a148ef7ac45497
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

package/Plugins/iOS/XDAccountSDK.framework/Headers/TDSGlobalThirdPartyLoginHelper.h

@@ -16,23 +16,6 @@ typedef void(^TDSGlobalAuthCancelCallback)(void);
 typedef void(^TDSGlobalAuthWatingCallback)(void);
 typedef void(^TDSGlobalAuthErrorCallback)(NSError *_Nullable error);
 
-//  后台登录方式枚举
-typedef NS_ENUM(NSInteger,XDGLoginInfoType) {
-    XDGLoginInfoTypeGuest = 0,
-    XDGLoginInfoTypeWeChat,
-    XDGLoginInfoTypeApple,
-    XDGLoginInfoTypeGoogle,
-    XDGLoginInfoTypeFacebook,
-    XDGLoginInfoTypeTapTap,
-    XDGLoginInfoTypeLine,
-    XDGLoginInfoTypeTwitter,
-    XDGLoginInfoTypeQQ,
-    XDGLoginInfoTypeTwitch,
-    XDGLoginInfoTypeSteam,
-    XDGLoginInfoTypePhone,
-    XDGLoginInfoTypeEmail,
-};
-
 @interface TDSGlobalThirdPartyLoginHelper : NSObject
 
 + (void)authByType:(LoginEntryType)authType

package/Plugins/iOS/XDAccountSDK.framework/Headers/XDGAccount.h

@@ -54,8 +54,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param handler 绑定结果回调
 + (void)bindByType:(LoginEntryType)bindType bindHandler:(XDGBindManagerRequestCallback)handler DEPRECATED_MSG_ATTRIBUTE("未来可能会废弃，使用该接口请和平台同事确认需求");
 
-+ (BOOL)isTokenActiveWithType:(LoginEntryType)type;
-
 @end
 
 NS_ASSUME_NONNULL_END

package/Plugins/iOS/XDAccountSDK.framework/Headers/XDGAccountVersion.h

@@ -4,6 +4,6 @@
 //
 //  Created by Fattycat on 2023/4/14.
 //
-#define XDGAccount_VERSION @"7.3.1"
-#define XDSAccount_VERSION_CODE @"7030100"
-// HASH e51483ce
+#define XDGAccount_VERSION @"7.6.1"
+#define XDSAccount_VERSION_CODE @"7060100"
+// HASH fbff8e7e

package/Runtime/Internal/Mobile/AccountFeaturesImpl.cs

@@ -6,12 +6,9 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using UnityEngine;
-using XD.SDK.Account.Internal.Http;
 using XD.SDK.Common;
 using XD.SDK.Common.Internal;
 using XD.SDK.Common.Internal.Events;
-using XD.SDK.Common.Internal.Http;
-using XD.SDK.Common.Internal.Mobile;
 using XD.SDK.Common.Internal.Mobile.Bridge;
 
 namespace XD.SDK.Account.Internal.Mobile
@@ -22,27 +19,6 @@ namespace XD.SDK.Account.Internal.Mobile
 
         private static readonly object LockObj = new object();
 
-        private const string LoginSynUrl = "/api/login/v1/syn";
-
-        private readonly Lazy<IHttpClient> defaultClient = new Lazy<IHttpClient>(() =>
-            XDHttpClientFactory.GetClient(nameof(AccountFeaturesImpl),
-                () =>
-                {
-                    return XDHttpClientFactory.CreateClient(XDGHost.CreateBaseHost(XDGCommonInternal.IsCn()), builder =>
-                    {
-                        builder
-                            .Timeout(TimeSpan.FromSeconds(10))
-                            .WithLogging()
-                            .AddInterceptor(new CommonParamsInterceptor())
-                            .AddInterceptor(new UrlBuildInterceptor())
-                            .AddInterceptor(new MacAuthenticationInterceptor())
-                            .Build();
-                    });
-                })
-        );
-
-        private IHttpClient HttpClient => defaultClient.Value;
-
         public static AccountFeaturesImpl Instance
         {
             get
@@ -101,7 +77,7 @@ namespace XD.SDK.Account.Internal.Mobile
                 .OnceTime(true)
                 .CommandBuilder();
 
-            EngineBridge.GetInstance().CallHandler(command, async result =>
+            EngineBridge.GetInstance().CallHandler(command, result =>
             {
                 var xdgError = result.Parse2XDGError();
                 if (xdgError != null)
@@ -115,7 +91,6 @@ namespace XD.SDK.Account.Internal.Mobile
                 if (userDic != null)
                 {
                     var user = new XDGUser(userDic);
-                    await SyncTdsUser(user);
                     if (loginType == LoginType.Default)
                     {
                         RefreshFacebookToken();
@@ -288,40 +263,6 @@ namespace XD.SDK.Account.Internal.Mobile
         private static extern IntPtr XDAccountBridgeGetAuthorization(string url, string method, long timestamp);
 #endif
 
-        private async Task SyncTdsUser(XDGUser user)
-        {
-            var bHasTdsUser = ReflectionUtils.FindType("TapTap.Bootstrap.TDSUser", "XD.SDK.TDSWrapper") != null;
-            if (!bHasTdsUser)
-            {
-                return;
-            }
-
-            try
-            {
-                var result = await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TdsSDKGetUser);
-                var objectId = XDDictionary.GetValue<string>(result.GetValueOrThrow(), "objectId");
-                if (objectId == user.UserId)
-                {
-                    return;
-                }
-
-                XDGEventBus.Publish(XDGEvents.TdsSDKLogout);
-                var response = await HttpClient.PostAsync<LoginSyncResponse>(LoginSynUrl);
-                var sessionToken = XDDictionary.GetValue<string>(response.Data, "sessionToken");
-                if (string.IsNullOrEmpty(sessionToken))
-                {
-                    XDGLogger.Warn("[SyncTDSUser] sessionToken is Null!", XDGLoggerTag.Bridge);
-                    return;
-                }
-
-                XDGEventBus.Publish(XDGEvents.TdsSDKSyncUser, sessionToken, user.UserId);
-            }
-            catch (XDGError e)
-            {
-                XDGLogger.Warn($"[SyncTDSUser] error:{e.ErrorMsg}", XDGLoggerTag.Bridge);
-            }
-        }
-
         private void RefreshFacebookToken()
         {
 #if UNITY_ANDROID
@@ -344,4 +285,4 @@ namespace XD.SDK.Account.Internal.Mobile
     }
 }
 
-#endif
+#endif

package/Runtime/Internal/Standalone/AccessToken/AccessTokenModule.cs

@@ -116,7 +116,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 if (xdException.Code == ResponseCode.Account.TokenExpired || xdException.HttpStatusCode == 401)
                     errorMsg = "XD_TOKEN_EXPIRED";
                 // 触发风控以及登陆频繁不需要发送 PreFail
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
                 if (xdException.Code != PhoneModule.INVALID_VERIFY_CODE &&
                     xdException.Code != PhoneModule.LOGIN_REQUEST_FREQUENTLY)
                 {

package/Runtime/Internal/Standalone/AccountFeaturesImpl.cs

@@ -117,7 +117,7 @@ namespace XD.SDK.Account.Internal.Standalone
 
         public async void OpenUserDashboard(XDGRoleInfo roleInfo)
         {
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
             try
             {
                 if (!XDGCommonInternal.IsCn())
@@ -331,7 +331,7 @@ namespace XD.SDK.Account.Internal.Standalone
 
         private async Task CancelAccount()
         {
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
             var current = UserModule.current;
             if (current == null)
             {

package/Runtime/Internal/Standalone/Auth/UrlSchemeAuth.cs

@@ -0,0 +1,149 @@
+#if UNITY_EDITOR || UNITY_STANDALONE
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEngine;
+using XD.SDK.Common;
+using XD.SDK.Common.Internal;
+using XD.SDK.Common.Internal.Standalone;
+
+namespace XD.SDK.Account.Internal.Standalone
+{
+    internal static class UrlSchemeAuth
+    {
+        internal const string RedirectSchemeKey = "redirect_scheme";
+
+        private const string DefaultUrlSchemePath = "oauth";
+
+        private const string StateKey = "state";
+
+        internal static string TryGetRedirectScheme()
+        {
+#if UNITY_STANDALONE_WIN && !UNITY_EDITOR
+            var scheme = StandaloneDeeplinkRegistrar.TryGetSchemeForCurrentGame();
+            if (string.IsNullOrEmpty(scheme))
+            {
+                return null;
+            }
+            return $"{scheme}://{DefaultUrlSchemePath}";
+#else
+            return null;
+#endif
+        }
+
+        internal static async Task<Dictionary<string, object>> WaitForFirstCallbackAsync(
+            List<HttpListener> servers,
+            LoginType loginType,
+            string state,
+            Func<Task<Dictionary<string, object>>> httpFallback)
+        {
+            if (string.IsNullOrEmpty(state))
+            {
+                // state 缺失时无法做会话隔离：直接走 http 
+                return httpFallback != null
+                    ? await httpFallback()
+                    : new Dictionary<string, object> { { "type", (int)loginType } };
+            }
+
+            var deepLinkTcs = new TaskCompletionSource<Dictionary<string, object>>(
+                TaskCreationOptions.RunContinuationsAsynchronously);
+            var cleaned = 0;
+
+            void StopAllListeners()
+            {
+                try
+                {
+                    foreach (var svr in servers)
+                    {
+                        svr.Stop();
+                    }
+                    servers.Clear();
+                }
+                catch
+                {
+                    // ignore
+                }
+            }
+
+#if UNITY_STANDALONE_WIN && !UNITY_EDITOR
+            Action<string> onDeepLink = deepLinkUrl =>
+            {
+                if (string.IsNullOrEmpty(deepLinkUrl)) return;
+
+                XDGLogger.Debug($"[Auth][DeepLink] url: {deepLinkUrl}", XDGLoggerTag.Account);
+
+                // 不用 new Uri()，直接截取 query，避免 Uri 对自定义 scheme 做编码归一化
+                int qIdx = deepLinkUrl.IndexOf('?');
+                if (qIdx < 0 || qIdx >= deepLinkUrl.Length - 1) return;
+
+                int fragIdx = deepLinkUrl.IndexOf('#', qIdx);
+                string query = fragIdx >= 0
+                    ? deepLinkUrl.Substring(qIdx + 1, fragIdx - qIdx - 1)
+                    : deepLinkUrl.Substring(qIdx + 1);
+
+                if (string.IsNullOrEmpty(query)) return;
+
+                var parsed = WebAuth.ParseQueryStringToDict(query);
+                var authData = new Dictionary<string, object> { { "type", (int)loginType } };
+                foreach (var kv in parsed) authData[kv.Key] = kv.Value;
+
+                if (!authData.TryGetValue(StateKey, out object st) || (st?.ToString() != state))
+                {
+                    XDGLogger.Debug($"[Auth][DeepLink] state mismatch, expected: {state}, got: {st}", XDGLoggerTag.Account);
+                    return;
+                }
+                AliyunTrack.LoginAuthorizeSuccess();
+                deepLinkTcs.TrySetResult(authData);
+            };
+
+            StandaloneDeepLinkReceiver.OnDeepLinkReceived += onDeepLink;
+#endif
+
+            var httpTask = httpFallback != null
+                ? httpFallback()
+                : Task.FromResult(new Dictionary<string, object> { { "type", (int)loginType } });
+
+            var timeout = Task.Delay(TimeSpan.FromMinutes(2));
+            var done = await Task.WhenAny(deepLinkTcs.Task, httpTask, timeout);
+
+            try
+            {
+                if (done == deepLinkTcs.Task)
+                {
+                    XDGLogger.Debug("[Auth] DeepLink auth succeeded (won race)", XDGLoggerTag.Account);
+                    StopAllListeners();
+                    return await deepLinkTcs.Task;
+                }
+
+                if (done == httpTask)
+                {
+                    XDGLogger.Debug("[Auth] HTTP auth succeeded (won race)", XDGLoggerTag.Account);
+                    return await httpTask;
+                }
+
+                XDGLogger.Debug("[Auth] Auth timeout (2min)", XDGLoggerTag.Account);
+                StopAllListeners();
+                return new Dictionary<string, object> { { "type", (int)loginType } };
+            }
+            finally
+            {
+                if (Interlocked.CompareExchange(ref cleaned, 1, 0) == 0)
+                {
+#if UNITY_STANDALONE_WIN && !UNITY_EDITOR
+                    try
+                    {
+                        StandaloneDeepLinkReceiver.OnDeepLinkReceived -= onDeepLink;
+                    }
+                    catch
+                    {
+                        // ignore
+                    }
+#endif
+                }
+            }
+        }
+    }
+}
+#endif

package/Runtime/Internal/Standalone/Auth/UrlSchemeAuth.cs.meta

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

package/Runtime/Internal/Standalone/Auth/WebAuth.cs

@@ -1,8 +1,8 @@
 #if UNITY_EDITOR || UNITY_STANDALONE
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net;
+using System.Threading;
 using System.Threading.Tasks;
 using UnityEngine;
 using XD.SDK.Common;
@@ -14,6 +14,28 @@ namespace XD.SDK.Account.Internal.Standalone
 {
     public class WebAuth
     {
+        private const string StateKey = "state";
+
+        internal static Dictionary<string, object> ParseQueryStringToDict(string queryString)
+        {
+            var result = new Dictionary<string, object>();
+            if (string.IsNullOrEmpty(queryString)) return result;
+
+            foreach (var pair in queryString.Split('&'))
+            {
+                if (string.IsNullOrEmpty(pair)) continue;
+                var idx = pair.IndexOf('=');
+                if (idx <= 0 || idx >= pair.Length - 1) continue;
+
+                var key = pair.Substring(0, idx);
+                // 用 UnescapeDataString 而非 WebUtility.UrlDecode（后者会把 + 当空格）
+                var value = Uri.UnescapeDataString(pair.Substring(idx + 1));
+                result[key] = value;
+            }
+
+            return result;
+        }
+
         protected static async Task<Dictionary<string, object>> StartListener(List<HttpListener> servers,
             LoginType loginType,
             Dictionary<string, object> queryParams)
@@ -23,6 +45,8 @@ namespace XD.SDK.Account.Internal.Standalone
             string lang = XDLocalization.GetLanguageKey();
 
             string url = ConfigModule.IsGlobal ? AuthConstants.GLOBAL_AUTH_HOST : AuthConstants.CN_AUTH_HOST;
+            string state = null;
+            string urlSchemeRedirect = UrlSchemeAuth.TryGetRedirectScheme();
             Dictionary<string, object> queryParameters = new Dictionary<string, object>
             {
                 { "redirect_uri", redirectUri },
@@ -52,14 +76,30 @@ namespace XD.SDK.Account.Internal.Standalone
                 }
             }
 
-            IEnumerable<string> queryPairs = queryParameters.Select(kv => $"{kv.Key}={kv.Value}");
-            string authRequest = $"{url}?{string.Join("&", queryPairs)}";
+            // 约定：外部必传 state（SDK 不再自动生成）
+            if (queryParameters.TryGetValue(StateKey, out object existingState))
+            {
+                state = existingState?.ToString();
+            }
+
+            // UrlScheme 主通道：Web 收到该参数后可在登录成功时主动唤起 UrlScheme 回传 token/code
+            if (!string.IsNullOrEmpty(urlSchemeRedirect))
+            {
+                queryParameters[UrlSchemeAuth.RedirectSchemeKey] = urlSchemeRedirect;
+            }
+
+            // 注意：redirect_scheme 的值包含 ://，必须单独对 query 做编码，否则 authRequest 会被破坏
+            string authRequest = $"{url}?{XDUrlUtils.ToQueryString(queryParameters)}";
 
             // 弹出授权页
-            XDGLogger.Debug($"auth: {authRequest}", XDGLoggerTag.Account);
+            XDGLogger.Debug($"[Auth] url: {url}", XDGLoggerTag.Account);
+            XDGLogger.Debug($"[Auth] state: {state}", XDGLoggerTag.Account);
+            XDGLogger.Debug($"[Auth] urlSchemeRedirect: {urlSchemeRedirect}", XDGLoggerTag.Account);
+            XDGLogger.Debug($"[Auth] redirectUri(http): {redirectUri}", XDGLoggerTag.Account);
+            XDGLogger.Debug($"[Auth] authRequest: {authRequest}", XDGLoggerTag.Account);
             AliyunTrack.LoginAuthorize();
-            // 登陆跳转授权 Track
-            Application.OpenURL(Uri.EscapeUriString(authRequest));
+            // authRequest 的 query 已经过 XDUrlUtils.ToQueryString 编码，避免二次转义导致参数异常
+            Application.OpenURL(authRequest);
 
             // 启动监听
             HttpListener server = new HttpListener();
@@ -68,6 +108,25 @@ namespace XD.SDK.Account.Internal.Standalone
 
             servers.Add(server);
 
+            // UrlScheme 竞速需要同时满足：平台支持 + scheme 可用 + state 存在（用于会话隔离）
+            // state 为空时直接走 HttpListener 兜底（UrlSchemeAuth 内部也会检查并回退）
+            Task<Dictionary<string, object>> HttpFallback()
+            {
+                return WaitForHttpCallbackAsync(servers, server, loginType);
+            }
+
+            return await UrlSchemeAuth.WaitForFirstCallbackAsync(
+                servers,
+                loginType,
+                state,
+                HttpFallback);
+        }
+
+        private static async Task<Dictionary<string, object>> WaitForHttpCallbackAsync(
+            List<HttpListener> servers,
+            HttpListener server,
+            LoginType loginType)
+        {
             Dictionary<string, object> authData = new Dictionary<string, object>
             {
                 { "type", (int)loginType }
@@ -97,45 +156,29 @@ namespace XD.SDK.Account.Internal.Standalone
 
                     servers.Clear();
 
-                    // 解析 Web 像 SDK 传递的参数
                     string[] urlSegments = context.Request.RawUrl.Split('?');
                     if (urlSegments.Length < 2)
                     {
-                        return new Dictionary<string, object>();
+                        return authData;
                     }
 
-                    string queryString = urlSegments[1];
-                    string[] queries = queryString.Split('&');
-
-                    foreach (string query in queries)
+                    var dict = ParseQueryStringToDict(urlSegments[1]);
+                    foreach (var kv in dict)
                     {
-                        if (string.IsNullOrEmpty(query))
-                        {
-                            continue;
-                        }
-
-                        string[] kv = query.Split('=');
-                        if (kv.Length < 2)
-                        {
-                            continue;
-                        }
-
-                        authData[kv[0]] = kv[1];
+                        authData[kv.Key] = kv.Value;
                     }
 
-                    // 登陆授权成功
                     AliyunTrack.LoginAuthorizeSuccess();
                     return authData;
                 }
                 catch (Exception e)
                 {
                     XDGLogger.Debug(e.Message, XDGLoggerTag.Account);
-                    // 异常结果则一直 pending
-                    // 登陆授权失败
+                    // 异常结果则一直 pending（保持原行为）
                     AliyunTrack.LoginAuthorizeFail(e.Message);
-                    TaskCompletionSource<Dictionary<string, object>> tcs =
+                    TaskCompletionSource<Dictionary<string, object>> pending_tcs =
                         new TaskCompletionSource<Dictionary<string, object>>();
-                    return await tcs.Task;
+                    return await pending_tcs.Task;
                 }
             }
         }

package/Runtime/Internal/Standalone/LoginModule/Email/EmailModule.cs

@@ -1,4 +1,4 @@
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;

package/Runtime/Internal/Standalone/LoginModule/Phone/PhoneModule.cs

@@ -1,4 +1,4 @@
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;

package/Runtime/Internal/Standalone/LoginModule/Phone/PhoneModuleIO.cs

@@ -1,4 +1,4 @@
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;

package/Runtime/Internal/Standalone/SupportModule/SupportModule.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Newtonsoft.Json;
 using UnityEngine;
 using XD.SDK.Common;
+using XD.SDK.Common.Internal;
 using XD.SDK.Common.Internal.Standalone;
 
 namespace XD.SDK.Account.Internal.Standalone
@@ -49,9 +50,9 @@ namespace XD.SDK.Account.Internal.Standalone
             XDGLogger.Debug("XSupportManager is disabled by config, skipping polling start", XDGLoggerTag.Support);
         }
 
-        private const string XdgSupportUserUnreadCheck = "api/support/v1/user/unread/check";
+        private const string XdgSupportUserUnreadCheck = "api/support/v2/user/unread/check";
 
-        private const string XdgSupportAnonymousUnreadCheck = "api/support/v1/user/anonymous/unread/check";
+        private const string XdgSupportAnonymousUnreadCheck = "api/support/v2/user/anonymous/unread/check";
 
         private const string XdgSupportUserGetURL = "api/support/v1/user/url/get";
 
@@ -74,8 +75,11 @@ namespace XD.SDK.Account.Internal.Standalone
 
                 if (xd)
                 {
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
-                    WebRequest.OpenWebPage(url, (code, data) => { });
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
+                    WebRequest.OpenWebPage(url, (code, data) =>
+                    {
+                        
+                    });
 #else
                     Application.OpenURL(url);
 #endif
@@ -89,49 +93,99 @@ namespace XD.SDK.Account.Internal.Standalone
 
         private static async void CheckUnRead()
         {
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
             XDGLogger.Debug("Support check unread", XDGLoggerTag.Support);
             try
             {
-                string requestUrl;
-                Dictionary<string, object> queryMap;
-                if (UserModule.GetCurrentUser() != null)
-                {
-                    requestUrl = XdgSupportUserUnreadCheck;
-                    queryMap = null;
-                }
-                else
-                {
-                    requestUrl = XdgSupportAnonymousUnreadCheck;
-                    queryMap = new Dictionary<string, object>()
+                var loggedIn = UserModule.GetCurrentUser() != null;
+                var requestUrl = loggedIn ? XdgSupportUserUnreadCheck : XdgSupportAnonymousUnreadCheck;
+                var queryMap = loggedIn
+                    ? null
+                    : new Dictionary<string, object>
                     {
                         { "anonymousId", SystemInfo.deviceUniqueIdentifier }
                     };
-                }
 
                 var response = await XDHttpClient.Client.GetAsync<SupportBaseResponse<SupportUnReadResponse>>(
                     requestUrl, null, queryMap);
 
-                var bHasUnRead = response.Data.HasUnread;
-                var bUnReadStatusChange = bHasUnRead != Instance.bLastHasRead;
-                Instance.bLastHasRead = bHasUnRead;
-                var nextTimeInterval = bUnReadStatusChange ? 10 : IncreaseTimeInterval();
-                Instance.nextCheckUnreadTime = response.Data.IntervalSec > 0 ? response.Data.IntervalSec : nextTimeInterval;
-                XDGLogger.Debug($"Support Check UnRead Success, hasUnread:{response.Data.HasUnread} interval:{response.Data.IntervalSec}", XDGLoggerTag.Support);
-                if (bUnReadStatusChange)
+                var type = response.Data?.Type?.ToLowerInvariant();
+                if (type == "lc")
                 {
-                    AccountFeaturesImpl.Instance.GetUserStatusCallback()
-                        .Invoke(response.Data.HasUnread ? XDGUserStatusCodeType.SupportHasUnRead : XDGUserStatusCodeType.SupportNoUnRead, null);
+                    var innerData = response.Data?.Lc;
+                    if (innerData == null || innerData.Count == 0)
+                    {
+                        HandleUnreadFail("server data is nil");
+                        return;
+                    }
+                    HandleUnreadData(innerData);
+                }
+                else if (type == "pn")
+                {
+                    var innerData = response.Data?.Pn;
+                    var targetUrl = innerData != null && innerData.TryGetValue("targetUrl", out var u) ? u as string : null;
+                    if (string.IsNullOrEmpty(targetUrl))
+                    {
+                        HandleUnreadFail("targetUrl is empty");
+                        return;
+                    }
+
+                    XDGLogger.Debug($"Support check unread success, targetUrl:{targetUrl}", XDGLoggerTag.Support);
+                    WebRequest.OpenWebPage(targetUrl, (action, data) =>
+                    {
+                        if (action != WebActionEnum.CLOSE) return;
+                        if (data == null || data.Count == 0)
+                        {
+                            HandleUnreadFail("web data is null");
+                            return;
+                        }
+                        HandleUnreadData(data);
+                    });
+                }
+                else
+                {
+                    HandleUnreadFail("server empty");
                 }
             }
             catch (XDGError e)
             {
-                UIManager.ShowToast(e.ErrorMsg);
-                Instance.nextCheckUnreadTime = IncreaseTimeInterval();
+                HandleUnreadFail(e.ErrorMsg);
+            }
+#else
+            XDGLogger.Debug("Support check unread skipped: vuplex disabled", XDGLoggerTag.Support);
+#endif
+        }
+
+        private static void HandleUnreadData(Dictionary<string, object> data)
+        {
+            var currentUnread = Instance.bLastHasRead;
+            var hasUnread = data.TryGetValue("hasUnread", out var hu) && hu is bool b ? b : currentUnread;
+            var webInterval = data.TryGetValue("intervalSec", out var iv) ? Convert.ToInt32(iv) : 0;
+
+            var unreadChanged = hasUnread != currentUnread;
+            Instance.bLastHasRead = hasUnread;
+            Instance.nextCheckUnreadTime = webInterval > 0
+                ? webInterval
+                : (unreadChanged ? 10 : IncreaseTimeInterval());
+
+            XDGLogger.Debug($"Support probe unread success, hasUnread:{hasUnread} nextCheckInterval:{Instance.nextCheckUnreadTime}", XDGLoggerTag.Support);
+
+            if (unreadChanged)
+            {
+                AccountFeaturesImpl.Instance.GetUserStatusCallback()
+                    .Invoke(hasUnread ? XDGUserStatusCodeType.SupportHasUnRead : XDGUserStatusCodeType.SupportNoUnRead, null);
             }
 
             StartCheckUnRead();
         }
 
+        private static void HandleUnreadFail(string reason)
+        {
+            Instance.nextCheckUnreadTime = IncreaseTimeInterval();
+            XDGLogger.Warn($"Support check unread failed, nextCheckInterval:{Instance.nextCheckUnreadTime} reason:{reason}", XDGLoggerTag.Support);
+            StartCheckUnRead();
+        }
+
         private static int IncreaseTimeInterval()
         {
             var currentInterval = Instance.nextCheckUnreadTime;
@@ -179,27 +233,15 @@ namespace XD.SDK.Account.Internal.Standalone
                 path = path ?? "";
                 extra = extra ?? new Dictionary<string, object>();
 
-                // 构建 URL-encoded 查询串（更简洁）
-                string Enc(string s)
-                {
-                    return Uri.EscapeDataString(s ?? string.Empty);
-                }
-
-                var parts = new List<string>();
-
+                var paramsObj = new Dictionary<string, object>(extra);
                 if (roleInfo != null)
                 {
-                    if (!string.IsNullOrEmpty(roleInfo.RoleId)) parts.Add($"{Enc("role_id")}={Enc(roleInfo.RoleId)}");
-                    if (!string.IsNullOrEmpty(roleInfo.RoleName)) parts.Add($"{Enc("role_name")}={Enc(roleInfo.RoleName)}");
-                    if (!string.IsNullOrEmpty(roleInfo.ServerId)) parts.Add($"{Enc("server_id")}={Enc(roleInfo.ServerId)}");
-                }
-
-                foreach (var kv in extra)
-                {
-                    parts.Add($"{Enc(kv.Key)}={Enc(kv.Value != null ? kv.Value.ToString() : string.Empty)}");
+                    if (!string.IsNullOrEmpty(roleInfo.RoleId)) paramsObj["role_id"] = roleInfo.RoleId;
+                    if (!string.IsNullOrEmpty(roleInfo.RoleName)) paramsObj["role_name"] = roleInfo.RoleName;
+                    if (!string.IsNullOrEmpty(roleInfo.ServerId)) paramsObj["server_id"] = roleInfo.ServerId;
                 }
 
-                var urlParams = string.Join("&", parts);
+                var urlParams = Uri.EscapeDataString(JsonConvert.SerializeObject(paramsObj));
 
                 var data = new Dictionary<string, object>
                 {

package/Runtime/Internal/Standalone/SupportModule/SupportResponse.cs

@@ -1,5 +1,6 @@
 #if UNITY_EDITOR || UNITY_STANDALONE
 
+using System.Collections.Generic;
 using Newtonsoft.Json;
 using XD.SDK.Common.Internal;
 
@@ -12,9 +13,11 @@ namespace XD.SDK.Account.Internal.Standalone
 
     public class SupportUnReadResponse
     {
-        [JsonProperty("hasUnread")] public bool HasUnread { get; set; }
+        [JsonProperty("type")] public string Type { get; set; }
 
-        [JsonProperty("intervalSec")] public int IntervalSec { get; set; }
+        [JsonProperty("lc")] public Dictionary<string, object> Lc { get; set; }
+
+        [JsonProperty("pn")] public Dictionary<string, object> Pn { get; set; }
     }
 
     public class SupportUrlResponse

package/Runtime/Internal/Standalone/UI/CodeUnbindAlert.cs

@@ -1,4 +1,4 @@
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
 using System;
 using System.Collections.Generic;
 using TMPro;

package/Runtime/Internal/Standalone/UI/Email/EmailAlert.cs

@@ -1,4 +1,4 @@
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
 using System;
 using System.Collections.Generic;
 using System.Linq;

package/Runtime/Internal/Standalone/UI/PhoneIO/AreaCodeCell.cs

@@ -1,4 +1,4 @@
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
 using System;
 using UnityEngine;
 using UnityEngine.UI;

package/Runtime/Internal/Standalone/UI/PhoneIO/PhoneAlertIO.cs

@@ -1,4 +1,4 @@
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
 using System;
 using System.Collections.Generic;
 using System.Linq;

package/Runtime/Internal/Standalone/UI/PhoneVerification/RiskControlAlert.cs

@@ -1,4 +1,4 @@
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
 using System;
 using System.Threading.Tasks;
 using System.Collections.Generic;
@@ -72,7 +72,7 @@ namespace XD.SDK.Account.Internal.Standalone
                                 {
                                     // 滑动验证失败
                                     await alert.Reload();
-                                    UIManager.ShowToast(e.Message);
+                                    UIManager.ShowToast(ex.ErrorMsg);
                                 }
                                 else
                                 {

package/Runtime/Internal/Standalone/UI/PhoneVerification/VerifyCodeInputAlert.cs

@@ -1,4 +1,4 @@
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
 using System;
 using System.Threading.Tasks;
 using System.Collections;

package/Runtime/Internal/Standalone/UserModule.cs

@@ -108,7 +108,7 @@ namespace XD.SDK.Account.Internal.Standalone
             if (loginType == LoginType.Phone)
             {
                 AliyunTrack.ResetPhoneLoginData();
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
                 if (XDGCommonInternal.IsCn())
                 {
                     await PhoneModule.Bind();
@@ -132,7 +132,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 }
                 else
                 {
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
                     await EmailModule.LoginOrBind(false);
 #else
                     throw new XDGError(ResponseCode.Common.Failed, "This function need vuplex enabled");
@@ -151,7 +151,7 @@ namespace XD.SDK.Account.Internal.Standalone
             if (loginType == LoginType.Phone)
             {
                 AliyunTrack.ResetPhoneLoginData();
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
                 // 手机号解绑需要验证码
                 if (XDGCommonInternal.IsCn())
                 {
@@ -174,7 +174,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 }
                 else
                 {
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
                     return EmailModule.Unbind(extras);
 #else
                     throw new XDGError(ResponseCode.Common.Failed, "This function need vuplex enabled");
@@ -265,7 +265,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 {
                     AliyunTrack.ResetPhoneLoginData();
                     AliyunTrack.LoginEnableSDKLoginTrack();
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
                     if (XDGCommonInternal.IsCn())
                     {
                         await PhoneModule.Login();
@@ -284,7 +284,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 {
                     AliyunTrack.ResetEmailLoginData();
                     AliyunTrack.LoginEnableSDKLoginTrack();
-#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
+#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
                     await EmailModule.LoginOrBind(true);
                     UIManager.ShowLoading();
 #else

package/Runtime/Internal/Standalone/WebFunction/GetUserInfoWebFunction.cs

@@ -0,0 +1,62 @@
+#if UNITY_EDITOR || UNITY_STANDALONE
+
+using System;
+using System.Collections.Generic;
+using XD.SDK.Common;
+using XD.SDK.Common.Internal;
+using XD.SDK.Common.Internal.Standalone;
+
+namespace XD.SDK.Account.Internal.Standalone
+{
+    public class GetUserInfoWebFunction : IWebFunction
+    {
+        public string GetName()
+        {
+            return "getUserInfo";
+        }
+
+        public async void Handler(IBridgeWebView webView, string data, Action<object> callbackFunction)
+        {
+            XDGLogger.Debug($"message from javascript by:{GetName()} with data:{data}", XDGLoggerTag.Web);
+
+            var user = await UserModule.GetLocalUser();
+            if (user == null || string.IsNullOrEmpty(user.UserId))
+            {
+                callbackFunction(new WebBridgeResponse.Failed
+                {
+                    Msg = "current user is null"
+                });
+                return;
+            }
+
+            var result = new Dictionary<string, object>
+            {
+                { "userId", user.UserId },
+                { "username", user.UserName },
+                { "loginTypeEntryName", user.LoginTypeName },
+                { "loginList", user.BoundAccounts ?? new List<string>() },
+                { "nickName", user.NickName },
+                { "avatar", user.Avatar }
+            };
+
+            var token = await AccessTokenModule.GetLocalAccessToken();
+            if (token != null)
+            {
+                result["accessToken"] = new Dictionary<string, object>
+                {
+                    { "kid", token.Kid },
+                    { "macKey", token.MacKey },
+                    { "macAlgorithm", token.MacAlgorithm },
+                    { "tokenType", token.TokenType },
+                    { "expireIn", token.ExpireIn }
+                };
+            }
+
+            callbackFunction(new WebBridgeResponse.Success
+            {
+                Data = result
+            });
+        }
+    }
+}
+#endif

package/Runtime/Internal/Standalone/WebFunction/GetUserInfoWebFunction.cs.meta

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

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.xd.sdk.account",
   "displayName": "XDGSDK Account",
-  "version": "7.3.4",
+  "version": "7.6.1",
   "description": "XDGSDK",
   "unity": "2019.3",
   "license": "MIT",
   "dependencies": {
-    "com.xd.sdk.common": "7.3.4"
+    "com.xd.sdk.common": "7.6.1"
   }
-}
+}

package/Plugins/Android/libs/XDGAccount_7.3.3.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 3fb7e7b9b8ed449d8382477b70b810a1
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 1
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Plugins/Android/libs/XDGBridgeAccount_v7_7.3.3.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: c384e2e57d3c54ea79502c23b2a03280
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 1
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Plugins/Android/libs/XDGSupport_7.3.3.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 7620e2432939c4e67a4ffb7db19d1322
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 1
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Runtime/Internal/Mobile/Http/LoginSyncResponse.cs

@@ -1,14 +0,0 @@
-#if UNITY_IOS || UNITY_ANDROID
-
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using XD.SDK.Common.Internal;
-
-namespace XD.SDK.Account.Internal.Http
-{
-    public class LoginSyncResponse : BaseResponse
-    {
-        [JsonProperty("data")] public Dictionary<string, object> Data;
-    }
-}
-#endif