com.xd.sdk.account 6.22.4 → 6.23.0

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

@@ -0,0 +1,16 @@
+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/XDGLoginServiceUnity.java.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e25783246c0d43df925f38764dc8d334
+timeCreated: 1728722090

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

@@ -0,0 +1,20 @@
+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/XDGLoginServiceUnityImpl.java.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 51946fca756346f3a1c2248afd79784c
+timeCreated: 1728722102

package/Mobile/Plugins/iOS/XDAccountBridge.m

@@ -26,19 +26,4 @@ const char*XDAccountBridgeGetUser() {
     return [userDic.tdsglobal_jsonString UTF8String];
 }
 
-void XDAccountOpenUserDashboard(const char* roleId, const char* roleName, const char* serverId, const char* extra) {
-    XDGRoleInfo *roleInfo = [XDGRoleInfo new];
-    if (roleId){
-        roleInfo.roleId = [NSString stringWithUTF8String:roleId];
-    }
-    if (roleName){
-        roleInfo.roleName = [NSString stringWithUTF8String:roleName];
-    }
-    if (serverId){
-        roleInfo.serverId = [NSString stringWithUTF8String:serverId];
-    }
-    if (extra){
-        roleInfo.extra = [NSString stringWithUTF8String:extra];
-    }
-    [XDGAccount openUserDashboardWithInfo:roleInfo];
-}
+

package/Mobile/Plugins/iOS/XDGLoginServiceUnity.h

@@ -0,0 +1,17 @@
+//
+// 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

package/Mobile/Plugins/iOS/XDGLoginServiceUnity.h.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: bbc8e694c27b4519acc5cc217532fd71
+timeCreated: 1728721972

package/Mobile/Plugins/iOS/XDGLoginServiceUnity.m

@@ -0,0 +1,23 @@
+//
+// XDGLoginServiceUnity.m
+// XDCommonSDK
+//
+// Created by 韩志强 on 2024/10/12.
+//
+
+#import "XDGLoginServiceUnity.h"
+#import <Foundation/Foundation.h>
+#import "XDAccountSDK/XDGAccount.h"
+
+@implementation XDGLoginServiceUnity
+
++ (void)serverId:(NSString* )serverId roleId:(NSString *)roleId roleName:(NSString *)roleName extra:(NSString *)extra {
+  XDGRoleInfo *roleInfo = [[XDGRoleInfo alloc] init];
+  roleInfo.serverId = serverId;
+  roleInfo.roleId = roleId;
+  roleInfo.roleName = roleName;
+  roleInfo.extra = extra;
+  [XDGAccount openUserDashboardWithInfo:roleInfo];
+}
+
+@end

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b9d9b9d48b0744bb9b79255417f1f189
+timeCreated: 1728722008

package/Mobile/XDGAccountMobile.cs

@@ -2,7 +2,6 @@
 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;
 
@@ -130,7 +129,7 @@ namespace XD.SDK.Account{
 
         public void OpenUserDashboard(XDGRoleInfo roleInfo)
         {
-            AccountMobile.OpenUserDashboard(roleInfo);
+            XDGAccountMobileImpl.GetInstance().OpenUserDashboard(roleInfo);
         }
 
         #endregion

package/Mobile/XDGAccountMobileImpl.cs

@@ -14,12 +14,17 @@ namespace XD.SDK.Account{
         //Account
         private static string ACCOUNT_SERVICE_NAME = "com.xd.intl.account.unitybridge.XDGLoginService";
         private static string ACCOUNT_SERVICE_IMPL = "com.xd.intl.account.unitybridge.XDGLoginServiceImpl";
+        private static string ACCOUNT_SERVICE_NAME_UNITY = "com.xd.account.bridge.XDGLoginServiceUnity";
+        private static string ACCOUNT_SERVICE_IMPL_UNITY = "com.xd.account.bridge.XDGLoginServiceUnityImpl";
         private XDGAccountMobileImpl(){
             EngineBridge.GetInstance()
                 .Register(ACCOUNT_SERVICE_NAME, ACCOUNT_SERVICE_IMPL);
+            EngineBridge.GetInstance()
+                .Register(ACCOUNT_SERVICE_NAME_UNITY, ACCOUNT_SERVICE_IMPL_UNITY);
         }
 
         private readonly string XDG_ACCOUNT_SERVICE = "XDGLoginService"; //注意要和iOS本地的桥接文件名一样！ 
+        private readonly string XDG_ACCOUNT_SERVICE_UNITY = "XDGLoginServiceUnity"; //注意要和iOS本地的桥接文件名一样！ 
         private static volatile XDGAccountMobileImpl _instance;
         private static readonly object Locker = new object();
 
@@ -418,6 +423,22 @@ namespace XD.SDK.Account{
                 callback(success);
             }); 
         }
-        
+
+        public void OpenUserDashboard(XDGRoleInfo roleInfo){
+            var dic = new Dictionary<string, object>{
+                {"serverId", roleInfo.serverId},
+                {"roleId", roleInfo.roleId},
+                {"roleName", roleInfo.roleName},
+                {"extra", roleInfo.extra}
+            };
+            var command = new Command.Builder()
+                .Service(XDG_ACCOUNT_SERVICE_UNITY)
+                .Method("openUserDashboard")
+                .Args(dic)
+                .Callback(false)
+                .OnceTime(true)
+                .CommandBuilder();
+            EngineBridge.GetInstance().CallHandler(command);
+        }
     }
 }

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

@@ -4,5 +4,5 @@
 //
 //  Created by Fattycat on 2023/4/14.
 //
-#define XDGAccount_VERSION @"6.22.3"
-// HASH 8f76a97
+#define XDGAccount_VERSION @"6.23.0"
+// HASH 98afc55

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

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 08fe1079ee053488b978901a4536f72d
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.xd.sdk.account",
   "displayName": "XDSDK Account",
-  "version": "6.22.4",
+  "version": "6.23.0",
   "description": "XDSDK",
   "unity": "2018.3",
   "license": "MIT",
   "dependencies": {
-    "com.xd.tds.bootstrap": "3.27.1-xd.1"
+    "com.xd.tds.bootstrap": "3.29.4-xd.2"
   }
 }

package/Mobile/Bridge/AccountMobile.cs

@@ -1,42 +0,0 @@
-#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(XDGRoleInfo roleInfo)
-        {
-#if UNITY_ANDROID
-            using (AndroidJavaClass accountBridge = new AndroidJavaClass("com.xd.account.bridge.XDGAccountBridge")) {
-                accountBridge.CallStatic("openUserDashboard", roleInfo.roleId, roleInfo.roleName, roleInfo.serverId, roleInfo.extra);
-            }
-#else
-            XDAccountOpenUserDashboard(roleInfo.roleId, roleInfo.roleName, roleInfo.serverId, roleInfo.extra);
-#endif
-        }
-        
-#if UNITY_IOS
-        [DllImport("__Internal")]
-        private static extern void XDAccountOpenUserDashboard(string roleId, string roleName, string serverId, string extra);
-#endif
-    }
-}
-
-#endif

package/Mobile/Bridge/AccountMobile.cs.meta

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

package/Mobile/Bridge.meta

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