com.xd.sdk.account 6.21.2 → 6.22.2

package/Mobile/Bridge/AccountMobile.cs

@@ -0,0 +1,40 @@
+#if UNITY_ANDROID || UNITY_IOS
+
+using System.Runtime.InteropServices;
+using UnityEngine;
+
+namespace XD.SDK.Account.Mobile.Bridge
+{
+    public class AccountMobile
+    {
+#if UNITY_ANDROID
+        private static AndroidJavaClass _androidJavaClass;
+
+        private static AndroidJavaClass GetInstance()
+        {
+            if (_androidJavaClass == null)
+            {
+                _androidJavaClass = new AndroidJavaClass("com.xd.intl.account.XDGAccount");
+            }
+
+            return _androidJavaClass;
+        }
+#endif
+
+        public static void OpenUserDashboard()
+        {
+#if UNITY_ANDROID
+            GetInstance().CallStatic("openUserDashboard");
+#else
+            XDAccountOpenUserDashboard();
+#endif
+        }
+        
+#if UNITY_IOS
+        [DllImport("__Internal")]
+        private static extern void XDAccountOpenUserDashboard();
+#endif
+    }
+}
+
+#endif

package/Mobile/Bridge/AccountMobile.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d77b9e2bf47e4fc79ce51ac1eaefc30b
+timeCreated: 1725936736

package/Mobile/Bridge.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f0035c338ae2437db6e07eb885f07429
+timeCreated: 1725936726

package/Mobile/Plugins/iOS/XDAccountBridge.m

@@ -9,6 +9,7 @@
 #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) {
@@ -24,3 +25,7 @@ const char*XDAccountBridgeGetUser() {
     NSDictionary *userDic = [XDGLoginService bridgeUserDic:user];
     return [userDic.tdsglobal_jsonString UTF8String];
 }
+
+void XDAccountOpenUserDashboard() {
+    [XDGAccount openUserDashboard];
+}

package/Mobile/XDGAccountMobile.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using XD.SDK.Account;
+using XD.SDK.Account.Mobile.Bridge;
 using XD.SDK.Common;
 using LoginType = XD.SDK.Account.LoginType;
 
@@ -126,6 +127,12 @@ namespace XD.SDK.Account{
         {
             XDGAccountMobileImpl.GetInstance().BindByType(loginType, (b, error)=> callback(b, error as XDGError));
         }
+
+        public void OpenUserDashboard()
+        {
+            AccountMobile.OpenUserDashboard();
+        }
+
         #endregion
     }
 }

package/Mobile/XDGAccountMobileImpl.cs

@@ -95,6 +95,8 @@ namespace XD.SDK.Account{
                     str += "PHONE,";
                 // } else if (type == XD.SDK.Account.LoginType.QQ){
                 //     str += "QQ,";
+                } else if (type == XD.SDK.Account.LoginType.Email){
+                    str += "EMAIL,";
                 }
             }
 

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

@@ -37,7 +37,8 @@ typedef NS_ENUM(NSInteger,XDGLoginInfoType) {
     XDGLoginInfoTypeQQ,
     XDGLoginInfoTypeTwitch,
     XDGLoginInfoTypeSteam,
-    XDGLoginInfoTypePhone
+    XDGLoginInfoTypePhone,
+    XDGLoginInfoTypeEmail,
 };
 
 @interface TDSGlobalThirdPartyLoginHelper : NSObject

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

@@ -17,7 +17,6 @@ FOUNDATION_EXPORT const unsigned char XDAccountSDKVersionString[];
 
 #import <XDAccountSDK/XDGAccount.h>
 #import <XDAccountSDK/TDSGlobalThirdPartyLoginHelper.h>
-#import <XDAccountSDK/TDSGlobalThirdPartyLoginManager.h>
 #import <XDAccountSDK/XDGLoginEntriesConfig.h>
 #import <XDAccountSDK/XDGLoginService.h>
 #import <XDAccountSDK/XDGAccountVersion.h>

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

@@ -48,16 +48,20 @@ typedef void (^XDGUserStatusChangeCallback)(XDGUserStateChangeCode userStateChan
 /// @param handler login result handler
 + (void)loginWithConfig:(XDGLoginEntriesConfig *)config handler:(XDGLoginManagerRequestCallback)handler;
 
-/// Logout current user
+/// 登出账号
 + (void)logout;
 
-/// Get current user
+/// 获取当前 User
+/// - Parameter handler: 回调
 + (void)getUser:(XDGLoginManagerRequestCallback)handler;
 
-/// Open usercenter view
+/// 打开用户中心
 + (void)openUserCenter;
 
-/// Open accountCancellation
+/// 打开个人信息页
++ (void)openUserDashboard;
+
+/// 打开注销页面
 + (void)accountCancellation;
 
 + (void)bindByType:(LoginEntryType)bindType bindHandler:(XDGBindManagerRequestCallback)handler;

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

@@ -4,5 +4,5 @@
 //
 //  Created by Fattycat on 2023/4/14.
 //
-#define XDGAccount_VERSION @"6.21.2"
-// HASH d3392de
+#define XDGAccount_VERSION @"6.22.2"
+// HASH cb5e085

package/Runtime/IXDGAccount.cs

@@ -38,5 +38,7 @@ namespace XD.SDK.Account{
         //除了 Default 和 Guest
         void BindByType(LoginType loginType, Action<bool, XDGError> callback);
 
+        void OpenUserDashboard();
+
     }
 }

package/Runtime/XDGAccount.cs

@@ -89,6 +89,11 @@ namespace XD.SDK.Account{
             platformWrapper.BindByType(loginType, callback);
         }
 
+        public static void OpenUserDashboard()
+        {
+            platformWrapper.OpenUserDashboard();
+        }
+
         public static string GetLoginTypeString(LoginType loginType)
         {
             switch (loginType)
@@ -115,6 +120,8 @@ namespace XD.SDK.Account{
                     return "Guest";
                 case XD.SDK.Account.LoginType.Phone:
                     return "Phone";
+                case XD.SDK.Account.LoginType.Email:
+                    return "Email";
                 default:
                     return "Default";
             }

package/Runtime/XDGLoginType.cs

@@ -2,27 +2,16 @@ namespace XD.SDK.Account
 {
     public enum LoginType
     {
-        Guest = 0,    // 游客登录
-        WeChat = 1,    // PC 未实现
-        Apple = 2,    // 苹果登录
-        Google = 3,    // Google 登录
-        Facebook = 4,    // Facebook 登录
-        TapTap = 5,    // Tap 登录
-        LINE = 6,    // PC 未实现
-        Twitter = 7,    // PC 未实现
-        // QQ       = 8,
-        // Twitch   = 9,
-        Steam = 10,   // Steam 登录
-        Phone = 11,   // 手机号 登陆
+        Guest = 0,      // 游客登录
+        Apple = 2,      // 苹果登录
+        Google = 3,     // Google 登录
+        Facebook = 4,   // Facebook 登录
+        TapTap = 5,     // Tap 登录
+        LINE = 6,       // Line 登录，PC 暂未实现
+        Twitter = 7,    // Twitter 登录，PC 暂未实现
+        Steam = 10,     // Steam 登录
+        Phone = 11,     // 手机号 登陆, 6.9.0 支持国内 6.22.0 支持海外
+        Email = 12,     // 邮箱 登陆，6.22.0 支持海外
         Default = -1,   // 自动登录，以上次登录成功的信息登录
     }
-    // ios的，要与后台一致！
-    // XDGLoginInfoTypeGuest = 0,
-    // XDGLoginInfoTypeWeChat = 1,
-    // XDGLoginInfoTypeApple = 2,
-    // XDGLoginInfoTypeGoogle = 3,
-    // XDGLoginInfoTypeFacebook = 4,
-    // XDGLoginInfoTypeTapTap = 5,
-    // XDGLoginInfoTypeLine = 6,
-    // XDGLoginInfoTypeTwitter = 7
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.xd.sdk.account",
   "displayName": "XDSDK Account",
-  "version": "6.21.2",
+  "version": "6.22.2",
   "description": "XDSDK",
   "unity": "2018.3",
   "license": "MIT",