com.xd.sdk.account 6.29.1 → 7.0.0

package/Runtime/Internal/XDGAccountEventHandler.cs

@@ -0,0 +1,23 @@
+using UnityEngine;
+using XD.SDK.Common.Internal.Events;
+
+#if UNITY_EDITOR || UNITY_STANDALONE
+using XD.SDK.Account.Internal.Standalone;
+#endif
+
+namespace XD.SDK.Account
+{
+    public static class XDGAccountEventHandler
+    {
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
+        static void RegisterEventHandlers()
+        {
+            XDGEventBus.Subscribe(XDGEvents.AccountGetCurrentUser, _ => XDGAccount.GetCurrentUser());
+#if UNITY_EDITOR || UNITY_STANDALONE
+            XDGEventBus.SubscribeAsync(XDGEvents.AccountGetAccessToken, async _ => await AccessTokenModule.GetLocalAccessToken());
+
+            XDGEventBus.Subscribe(XDGEvents.AccountSupportStartPolling, _ => SupportModule.Instance.TryStartPolling());
+#endif
+        }
+    }
+}

package/Runtime/Internal/XDGAccountEventHandler.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4164f6e9886d492e8a31f4b54862eef2
+timeCreated: 1752049234

package/Runtime/Internal/XDGAccountInternal.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using UnityEngine;
+using XD.SDK.Common;
+using XD.SDK.Common.Internal;
+
+namespace XD.SDK.Account
+{
+    internal class XDGAccountInternal
+    {
+        private static IXDGAccountExtended _platformWrapper;
+
+        static XDGAccountInternal()
+        {
+#if UNITY_IOS || UNITY_ANDROID
+            _platformWrapper = XD.SDK.Account.Internal.Mobile.AccountFeaturesImpl.Instance;
+#elif UNITY_STANDALONE
+            _platformWrapper = XD.SDK.Account.Internal.Standalone.AccountFeaturesImpl.Instance;
+#endif
+            if (_platformWrapper == null)
+            {
+                XDGLogger.Error("unsupported platform: " + Application.platform);
+            }
+        }
+
+        internal static void AddUserStatusChangeCallback(Action<XDGUserStatusCodeType, string> callback)
+        {
+            _platformWrapper.AddUserStatusChangeCallback(callback);
+        }
+
+        internal static void LoginByType(LoginType loginType, Action<XDGUser> callback, Action<XDGError> errorCallback)
+        {
+            _platformWrapper.LoginByType(loginType, callback, errorCallback);
+        }
+
+        // internal static void LoginByConsole(Action<XDGUser> successCallback, Action failCallback,
+        //     Action<XDGError> errorCallback)
+        // {
+        //     _platformWrapper.LoginByConsole(successCallback, failCallback, errorCallback);
+        // }
+
+        internal static void Logout()
+        {
+            _platformWrapper.Logout();
+        }
+
+        internal static XDGUser GetCurrentUser()
+        {
+            return _platformWrapper.GetCurrentUser();
+        }
+
+        internal static void OpenCustomerService(XDGRoleInfo roleInfo, string path, Dictionary<string, object> paramsMap)
+        {
+            _platformWrapper.OpenCustomerService(roleInfo, path, paramsMap);
+        }
+
+        internal static void OpenUserCenter()
+        {
+            _platformWrapper.OpenUserCenter();
+        }
+
+        internal static void OpenUserDashboard(XDGRoleInfo roleInfo)
+        {
+            _platformWrapper.OpenUserDashboard(roleInfo);
+        }
+
+        internal static void OpenAccountDeletion()
+        {
+            _platformWrapper.OpenAccountDeletion();
+        }
+
+        internal static void BindByType(LoginType loginType, Action<bool, XDGError> callback)
+        {
+            _platformWrapper.BindByType(loginType, callback);
+        }
+
+        internal static Task<Dictionary<string, string>> GetRequestAuthorizationHeader(HttpRequestMessage request,
+            long timestamp)
+        {
+            return _platformWrapper.GetRequestAuthorizationHeader(request, timestamp);
+        }
+    }
+}

package/Runtime/Internal/XDGAccountInternal.cs.meta

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

package/Runtime/Internal.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4e09c26405b564b47bdb6137ed3058fe
+guid: 2fe3237295d14f61908cf4d9335c9a47
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

package/Runtime/Public/XDGAccount.Deprecated.cs

@@ -0,0 +1,37 @@
+#if XDSDK_DEPRECATED
+using System;
+using System.Collections.Generic;
+using XD.SDK.Common;
+
+namespace XD.SDK.Account
+{
+    partial class XDGAccount
+    {
+        [Obsolete("Deprecated in XDSDK 7.x")]
+        public static void Login(List<LoginType> loginTypes, Action<XDGUser> callback, Action<XDGError> errorCallback)
+        {
+            
+        }
+
+        [Obsolete("Deprecated in XDSDK 7.x")]
+        public static void GetUser(Action<XDGUser> callback, Action<XDGError> errorCallback)
+        {
+        }
+
+        [Obsolete("Deprecated in XDSDK 7.x")]
+        public static void OpenUnregister()
+        {
+        }
+
+        [Obsolete("Deprecated in XDSDK 7.x")]
+        public static void IsTokenActiveWithType(LoginType loginType, Action<bool> callback){
+        }
+
+        [Obsolete("Deprecated in XDSDK 7.x")]
+        public static string GetLoginTypeString(LoginType loginType)
+        {
+            return "";
+        }
+    }
+}
+#endif

package/Runtime/Public/XDGAccount.Deprecated.cs.meta

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

package/Runtime/Public/XDGAccount.cs

@@ -0,0 +1,107 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine.Scripting;
+using XD.SDK.Account.Internal;
+using XD.SDK.Common;
+
+[assembly: Preserve]
+[assembly: AlwaysLinkAssembly]
+
+namespace XD.SDK.Account
+{
+    public static partial class XDGAccount
+    {
+        /// <summary>
+        /// 注册用户状态变化回调
+        /// </summary>
+        /// <param name="callback"></param>
+        public static void AddUserStatusChangeCallback(Action<XDGUserStatusCodeType, string> callback)
+        {
+            XDGAccountInternal.AddUserStatusChangeCallback(callback);
+        }
+        
+        /// <summary>
+        /// 开始登录
+        /// </summary>
+        /// <param name="loginType">授权类型</param>
+        /// <param name="successCallback">登录成功回调</param>
+        /// <param name="errorCallback">登录失败回调</param>
+        public static void LoginByType(LoginType loginType, Action<XDGUser> successCallback,
+            Action<XDGError> errorCallback)
+        {
+            XDGAccountInternal.LoginByType(loginType, successCallback, errorCallback);
+        }
+
+        public static void LoginByConsole(Action<XDGUser> successCallback, Action failCallback,
+            Action<XDGError> errorCallback)
+        {
+            XDGAccountInternal.LoginByType(LoginType.Console, successCallback, errorCallback);
+        }
+
+        /// <summary>
+        /// 退出登录
+        /// </summary>
+        public static void Logout()
+        {
+            XDGAccountInternal.Logout();
+        }
+
+        /// <summary>
+        /// 获取当前用户信息
+        /// </summary>
+        /// <returns></returns>
+        public static XDGUser GetCurrentUser()
+        {
+            return XDGAccountInternal.GetCurrentUser();
+        }
+
+        /// <summary>
+        /// 打开客服页面
+        /// </summary>
+        /// <param name="roleInfo">角色信息</param>
+        /// <param name="path">XDSDK 客服路径</param>
+        /// <param name="paramsMap">XDSDK 客服透传数据</param>
+        public static void OpenCustomerService(XDGRoleInfo roleInfo, string path, Dictionary<string, object> paramsMap)
+        {
+            XDGAccountInternal.OpenCustomerService(roleInfo, path, paramsMap);
+        }
+        
+        /// <summary>
+        /// 打开用户中心
+        /// </summary>
+        public static void OpenUserCenter(XDGRoleInfo roleInfo)
+        {
+            XDGAccountInternal.OpenUserCenter();
+        }
+        
+        /// <summary>
+        /// 打开个人信息页面
+        /// Tips: 仅在国内可用
+        /// Tips: 在 PNSDK 环境下不可用
+        /// </summary>
+        /// <param name="roleInfo"></param>
+        public static void OpenUserDashboard(XDGRoleInfo roleInfo)
+        {
+            XDGAccountInternal.OpenUserDashboard(roleInfo);
+        }
+
+        /// <summary>
+        /// 打开注销页面
+        /// Tips: 在 PNSDK 环境下不可用
+        /// </summary>
+        public static void OpenAccountDeletion()
+        {
+            XDGAccountInternal.OpenAccountDeletion();
+        }
+        
+        /// <summary>
+        /// 绑定账号
+        /// </summary>
+        /// <param name="loginType">账号类型</param>
+        /// <param name="callback">绑定回调</param>
+        public static void BindByType(LoginType loginType, Action<bool, XDGError> callback)
+        {
+            XDGAccountInternal.BindByType(loginType, callback);
+        }
+    }
+}

package/Runtime/{XDGAccount.cs.meta → Public/XDGAccount.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cc57b1b10f984bc9b5aaa982a332fbc6
+guid: 65e5b5c9cfbe4cf492e53bcfbc85c10b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Runtime/Public.meta

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

package/Runtime/XD.SDK.Account.asmdef

@@ -1,8 +1,13 @@
 {
     "name": "XD.SDK.Account",
+    "rootNamespace": "",
     "references": [
-        "GUID:0b3f64ec33f5b4da98a17367a35b82f2",
-        "GUID:271a06ab0780d4a5ea46c9c3be2ab5dc"
+        "XD.SDK.Common",
+        "XD.SDK.Foundation",
+        "Vuplex.WebView",
+        "Unity.TextMeshPro",
+        "TapTap.Common.Runtime",
+        "TapTap.Login.Runtime"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

package/Runtime/XD.SDK.Account.asmdef.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c72576b1c89c54ea0a0d748ee92b35c2
+guid: fee691e3ed864e77a1f3888a1d3f6b9c
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 

package/Runtime.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ca10f44e0b6a48ffb5ffae02d337e913
+guid: 465e6c87a8714a25bcd30f292bf0ab1a
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.xd.sdk.account",
-  "displayName": "XDSDK Account",
-  "version": "6.29.1",
-  "description": "XDSDK",
-  "unity": "2018.3",
+  "displayName": "XDGSDK Account",
+  "version": "7.0.0",
+  "description": "XDGSDK",
+  "unity": "2019.3",
   "license": "MIT",
   "dependencies": {
-    "com.xd.tds.bootstrap": "3.30.0-xd.1"
+    "com.xd.sdk.common": "7.0.0"
   }
 }

package/package.json.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 1c1028f3dafd84b0e913ecc06aa77b3f
-TextScriptImporter:
+guid: ef41cc53322742599f0d9c57f38c3a65
+PackageManifestImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

package/Mobile/Editor/XD.SDK.Account.Mobile.Editor.asmdef

@@ -1,20 +0,0 @@
-{
-    "name": "XD.SDK.Account.Mobile.Editor",
-    "references": [
-        "GUID:616cea76def2d4f059b94440fc8cc03d",
-        "GUID:747e53b1749584bae9386571797e5eb5",
-        "GUID:0acc523941302664db1f4e527237feb3",
-        "GUID:27619889b8ba8c24980f49ee34dbb44a"
-    ],
-    "includePlatforms": [
-        "Editor"
-    ],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [],
-    "noEngineReferences": false
-}

package/Mobile/Editor/XD.SDK.Account.Mobile.Editor.asmdef.meta

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

package/Mobile/Editor/XDAccountMobileProcessBuild.cs

@@ -1,20 +0,0 @@
-using System;
-using TapTap.Common.Editor;
-using UnityEditor.Build.Reporting;
-
-namespace XD.SDK.Account.Editor
-{
-    public class XDAccountMobileProcessBuild : SDKLinkProcessBuild {
-        public override int callbackOrder => 6;
-        
-        public override string LinkPath => "XDSDK/Gen/Account/Mobile/link.xml";
-        
-        public override LinkedAssembly[] LinkedAssemblies => new LinkedAssembly[] {
-            new LinkedAssembly { Fullname = "XD.SDK.Account.Mobile" }
-        };
-        
-        public override Func<BuildReport, bool> IsTargetPlatform => (report) => {
-            return BuildTargetUtils.IsSupportMobile(report.summary.platform);
-        };
-    }
-}

package/Mobile/Http/XDGAccountHttpConfigMobile.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading.Tasks;
-using System.Runtime.InteropServices;
-using UnityEngine;
-
-namespace XD.SDK.Account.Internal {
-    public class XDGAccountHttpConfigMobile : IXDAccountHttpConfig {
-        public Task<Dictionary<string, string>> GetAuthorizationHeaders(HttpRequestMessage request, long timestamp) {
-            string url = request.RequestUri.AbsoluteUri;
-            string method = request.Method.ToString().ToUpper();
-            string authorization;
-#if UNITY_ANDROID
-            using (AndroidJavaClass AccountBridgeClass = new AndroidJavaClass("com.xd.account.bridge.XDGAccountBridge")) {
-                authorization = AccountBridgeClass.CallStatic<string>("getAuthorization", url, method, timestamp);
-            }
-#elif UNITY_IOS
-            IntPtr ptr = XDAccountBridgeGetAuthorization(url, method, timestamp);
-            authorization = Marshal.PtrToStringAnsi(ptr);
-#endif
-            if (string.IsNullOrEmpty(authorization)) {
-                return Task.FromResult(new Dictionary<string, string>());
-            }
-
-            return Task.FromResult(new Dictionary<string, string> {
-                { "Authorization", authorization }
-            });
-        }
-
-#if UNITY_IOS
-        [DllImport("__Internal")]
-        private static extern IntPtr XDAccountBridgeGetAuthorization(string url, string method, long timestamp);
-#endif
-    }
-}

package/Mobile/Plugins/Android/com/xd/account/bridge/XDGAccountBridge.java

@@ -1,36 +0,0 @@
-package com.xd.account.bridge;
-
-import android.os.Handler;
-import android.os.Looper;
-
-import com.xd.intl.common.net.CommonParameterManager;
-import com.xd.intl.common.bridge.BridgeUtil;
-import com.xd.intl.common.global.GlobalUserStore;
-import com.xd.intl.account.XDGAccount;
-import com.xd.intl.account.v2.entity.RoleInfo;
-
-public class XDGAccountBridge {
-    public static String getAuthorization(String url, String method, long timestamp) {
-        return CommonParameterManager.getInstance().getRequestAuthorizationHeaderString(url, method, timestamp * 1000);
-    }
-    
-    public static String getCurrentUser() {
-        return BridgeUtil.convertUserJsonString4Bridge(GlobalUserStore.INSTANCE.getCurrentXDUser());
-    }
-    
-    public static void openUserDashboard (String roleId, String roleName, String serverId, String extra){
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
-            @Override
-            public void run() {
-                XDGAccount.openUserDashboard(
-                        RoleInfo.newBuilder()
-                                .setRoleId(roleId)
-                                .setRoleName(roleName)
-                                .setServerId(serverId)
-                                .setExtra(extra)
-                                .build()
-                );
-            }
-        });
-    }
-}

package/Mobile/Plugins/Android/com/xd/account/bridge/XDGLoginServiceUnity.java

@@ -1,16 +0,0 @@
-package com.xd.account.bridge;
-
-import com.tds.common.bridge.IBridgeService;
-import com.tds.common.bridge.annotation.BridgeMethod;
-import com.tds.common.bridge.annotation.BridgeParam;
-import com.tds.common.bridge.annotation.BridgeService;
-
-@BridgeService("XDGLoginServiceUnity")
-public interface XDGLoginServiceUnity extends IBridgeService {
-
-    @BridgeMethod("openUserDashboard")
-    void openUserDashboard(@BridgeParam("serverId") String serverId,
-                           @BridgeParam("roleId") String roleId,
-                           @BridgeParam("roleName") String roleName,
-                           @BridgeParam("extra") String extra);
-}

package/Mobile/Plugins/Android/com/xd/account/bridge/XDGLoginServiceUnityImpl.java

@@ -1,20 +0,0 @@
-package com.xd.account.bridge;
-
-import com.xd.intl.account.XDGAccount;
-import com.xd.intl.account.v2.entity.RoleInfo;
-
-public class XDGLoginServiceUnityImpl implements XDGLoginServiceUnity {
-    private static final String TAG = XDGLoginServiceUnity.class.getSimpleName();
-
-    @Override
-    public void openUserDashboard(String serverId, String roleId, String roleName, String extra) {
-        XDGAccount.openUserDashboard(
-                RoleInfo.newBuilder()
-                        .setRoleId(roleId)
-                        .setRoleName(roleName)
-                        .setServerId(serverId)
-                        .setExtra(extra)
-                        .build()
-        );
-    }
-}

package/Mobile/Plugins/Android/com/xd/account/bridge.meta

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

package/Mobile/Plugins/Android/com/xd/account.meta

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

package/Mobile/Plugins/Android/com/xd.meta

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

package/Mobile/Plugins/Android/com.meta

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

package/Mobile/Plugins/Android.meta

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

package/Mobile/Plugins/iOS/XDAccountBridge.m

@@ -1,29 +0,0 @@
-//
-//  XDAccountBridge.m
-//  Unity-iPhone
-//
-//  Created by oneRain on 2024/3/6.
-//
-
-#import <Foundation/Foundation.h>
-#import <XDCommonSDK/XDGHttpRequest.h>
-#import <XDCommonSDK/XDGUser.h>
-#import <XDAccountSDK/XDGLoginService.h>
-#import <XDAccountSDK/XDGAccount.h>
-#import <XDCommonSDK/NSDictionary+TDSGlobalJson.h>
-
-const char* XDAccountBridgeGetAuthorization(const char* url, const char* method, long timestamp) {
-    NSString *auth = [XDGHttpRequest getMactoken:[NSURL URLWithString:[NSString stringWithUTF8String:url]] method:[NSString stringWithUTF8String:method] time:[[NSNumber numberWithLong:timestamp] stringValue]];
-    return [auth UTF8String];
-}
-
-const char*XDAccountBridgeGetUser() {
-    XDGUser *user = [XDGUser currentUser];
-    if (user.userId == nil || user.userId.length == 0) {
-        return nil;
-    }
-    NSDictionary *userDic = [XDGLoginService bridgeUserDic:user];
-    return [userDic.tdsglobal_jsonString UTF8String];
-}
-
-

package/Mobile/Plugins/iOS/XDAccountBridge.m.meta

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

package/Mobile/Plugins/iOS/XDGLoginServiceUnity.h

@@ -1,17 +0,0 @@
-//
-// XDGLoginServiceUnity.h
-// XDCommonSDK
-//
-// Created by 韩志强 on 2024/10/12.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface XDGLoginServiceUnity : NSObject
-// openUserDashboard
-+ (void)serverId:(NSString* )serverId roleId:(NSString *)roleId roleName:(NSString *)roleName extra:(NSString *)extra;
-@end
-
-NS_ASSUME_NONNULL_END