com.xd.sdk.account 7.2.0 → 7.2.1-alpha.2

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

@@ -116,11 +116,15 @@ 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 (xdException.Code != PhoneModule.INVALID_VERIFY_CODE &&
                     xdException.Code != PhoneModule.LOGIN_REQUEST_FREQUENTLY)
                 {
                     AliyunTrack.LoginPreFail(errorMsg);
                 }
+#else
+                AliyunTrack.LoginPreFail(errorMsg);
+#endif
 
                 throw xdException;
             }

package/Runtime/Internal/Standalone/AccountFeaturesImpl.cs

@@ -66,11 +66,11 @@ namespace XD.SDK.Account.Internal.Standalone
             }
             catch (XDGError xe)
             {
-                errorCallback?.Invoke(xe);
+                errorCallback?.Invoke(xe.ParseToError());
             }
             catch (Exception e)
             {
-                errorCallback?.Invoke(new XDGError(ResponseCode.Common.Failed, e.Message));
+                errorCallback?.Invoke(e.ParseToError());
             }
         }
 
@@ -117,6 +117,7 @@ namespace XD.SDK.Account.Internal.Standalone
 
         public async void OpenUserDashboard(XDGRoleInfo roleInfo)
         {
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
             try
             {
                 if (!XDGCommonInternal.IsCn())
@@ -184,6 +185,9 @@ namespace XD.SDK.Account.Internal.Standalone
             {
                 XDGLogger.Error(new XDGError(ResponseCode.Common.Failed, e.Message), XDGLoggerTag.Account);
             }
+#else
+            XDGLogger.Error("This function need vuplex enabled", XDGLoggerTag.Account);
+#endif
         }
 
         public async void OpenAccountDeletion()
@@ -207,7 +211,7 @@ namespace XD.SDK.Account.Internal.Standalone
             }
             catch (XDGError e)
             {
-                callback?.Invoke(false, new XDGError(ResponseCode.Common.Failed, e.ErrorMsg));
+                callback?.Invoke(false, e.ParseToError());
             }
         }
 
@@ -239,8 +243,7 @@ namespace XD.SDK.Account.Internal.Standalone
             {
                 var user = await UserModule.Login(loginType);
                 AliyunTrack.LoginAntiAddictionStartup();
-                var complianceResult =
-                    await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TapSDKComplianceStartup, ConfigModule.IsGlobal, user.UserId);
+                var complianceResult = await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TapSDKComplianceStartup, ConfigModule.IsGlobal, user.UserId);
                 // TODO 统一走回调进行埋点
                 // AliyunTrack.LoginAntiAddictionResult(XDDictionary.GetValue(complianceResult, "code", -100),
                 // XDDictionary.GetValue<string>(complianceResult, "reason"),
@@ -249,6 +252,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 if (XDDictionary.GetValue<bool>(compliance, "success"))
                 {
                     await AgreementModule.SignAgreement(user.UserId);
+                    AliyunTrack.LoginSuccess();
                     return user;
                 }
 
@@ -327,6 +331,7 @@ namespace XD.SDK.Account.Internal.Standalone
 
         private async Task CancelAccount()
         {
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
             var current = UserModule.current;
             if (current == null)
             {
@@ -389,6 +394,9 @@ namespace XD.SDK.Account.Internal.Standalone
             {
                 UIManager.DismissLoading();
             }
+#else
+            XDGLogger.Error("This function need vuplex enabled", XDGLoggerTag.Account);
+#endif
         }
 
         private static async Task<XDGUser> InvokeXdgPaymentCheckRefundStatusWithUI(XDGUser user)

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

@@ -14,7 +14,7 @@ namespace XD.SDK.Account.Internal.Standalone
 
         internal static async Task<Dictionary<string, object>> GetAuthData()
         {
-            if (SteamUtils.IsSDKSupported)
+            if (SteamWrapper.Initialized())
             {
                 // 先尝试从 Steam SDK 中获取 auth data
                 Dictionary<string, object> authData = await GetAuthDataFromSDK();
@@ -38,7 +38,7 @@ namespace XD.SDK.Account.Internal.Standalone
             AliyunTrack.LoginAuthorize();
             try
             {
-                string ticket = await SteamUtils.Instance.GetAuthTicket();
+                string ticket = await SteamWrapper.Instance.GetAuthTicket();
                 if (string.IsNullOrWhiteSpace(ticket))
                 {
                     // 登陆授权失败
@@ -70,12 +70,12 @@ namespace XD.SDK.Account.Internal.Standalone
 
         public static string GetSteamIdFromSDK()
         {
-            return SteamUtils.Instance.GetSteamId();
+            return SteamWrapper.Instance.GetSteamId();
         }
 
         public static Dictionary<string, object> GetCacheData()
         {
-            if (!SteamUtils.IsSDKSupported)
+            if (!SteamWrapper.Initialized())
             {
                 return null;
             }

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

@@ -1,4 +1,4 @@
-#if UNITY_EDITOR || UNITY_STANDALONE
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !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
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !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
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;

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

@@ -74,7 +74,11 @@ namespace XD.SDK.Account.Internal.Standalone
 
                 if (xd)
                 {
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
                     WebRequest.OpenWebPage(url, (code, data) => { });
+#else
+                    Application.OpenURL(url);
+#endif
                 }
                 else
                 {

package/Runtime/Internal/Standalone/Track/AliyunTrack.Login.cs

@@ -440,12 +440,10 @@ namespace XD.SDK.Account.Internal.Standalone
             content["user_login_type"] = string.IsNullOrEmpty(current) ? "" : userLoginTypeString;
             content["logid"] = CommonTrack.GetLogId(LoginEventSessionId, eventName);
             content["isLoginModule"] = "true";
-#if XD_STEAM_SUPPORT
-            if (SteamUtils.IsSDKSupported)
+            if (SteamWrapper.Initialized())
             {
                 content["console_type"] = "steam";
             }
-#endif
 
             if (isPhoneLogin)
             {

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

@@ -1,4 +1,4 @@
-#if UNITY_EDITOR || UNITY_STANDALONE
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !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
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !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
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !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
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !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
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
 using System;
 using System.Threading.Tasks;
 using System.Collections.Generic;

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

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

package/Runtime/Internal/Standalone/UserModule.cs

@@ -108,6 +108,7 @@ namespace XD.SDK.Account.Internal.Standalone
             if (loginType == LoginType.Phone)
             {
                 AliyunTrack.ResetPhoneLoginData();
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
                 if (XDGCommonInternal.IsCn())
                 {
                     await PhoneModule.Bind();
@@ -116,6 +117,9 @@ namespace XD.SDK.Account.Internal.Standalone
                 {
                     await PhoneModuleIO.LoginOrBind(false);
                 }
+#else
+                throw new XDGError(ResponseCode.Common.Failed, "This function need vuplex enabled");
+#endif
 
                 return;
             }
@@ -124,11 +128,15 @@ namespace XD.SDK.Account.Internal.Standalone
                 if (XDGCommonInternal.IsCn())
                 {
                     XDGLogger.Warn("暂不支持的登录方式", XDGLoggerTag.Account);
-                    throw new XDGError(ResponseCode.Common.UnavailableService, "暂不支持的登录方式");
+                    throw new XDGError(ResponseCode.Account.TypeNotAvailable, "Email auth is not support in CN");
                 }
                 else
                 {
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
                     await EmailModule.LoginOrBind(false);
+#else
+                    throw new XDGError(ResponseCode.Common.Failed, "This function need vuplex enabled");
+#endif
                 }
 
                 return;
@@ -143,6 +151,7 @@ namespace XD.SDK.Account.Internal.Standalone
             if (loginType == LoginType.Phone)
             {
                 AliyunTrack.ResetPhoneLoginData();
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
                 // 手机号解绑需要验证码
                 if (XDGCommonInternal.IsCn())
                 {
@@ -152,17 +161,24 @@ namespace XD.SDK.Account.Internal.Standalone
                 {
                     return PhoneModuleIO.Unbind(extras);
                 }
+#else
+                throw new XDGError(ResponseCode.Common.Failed, "This function need vuplex enabled");
+#endif
             }
             else if (loginType == LoginType.Email)
             {
                 if (XDGCommonInternal.IsCn())
                 {
                     XDGLogger.Warn($"暂不支持的登录方式:{LoginType.Email}", XDGLoggerTag.Account);
-                    throw new XDGError(ResponseCode.Common.UnavailableService, "暂不支持的登录方式");
+                    throw new XDGError(ResponseCode.Common.UnavailableService, "Email auth is not support in CN");
                 }
                 else
                 {
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
                     return EmailModule.Unbind(extras);
+#else
+                    throw new XDGError(ResponseCode.Common.Failed, "This function need vuplex enabled");
+#endif
                 }
             }
 
@@ -216,7 +232,7 @@ namespace XD.SDK.Account.Internal.Standalone
                     catch (XDGError e)
                     {
                         XDGLogger.Warn(e.ErrorMsg, XDGLoggerTag.Account);
-                        throw new XDGError(ResponseCode.Common.Failed, e.ErrorMsg);
+                        throw;
                     }
                 }
 
@@ -228,7 +244,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 {
                     if (e.HttpStatusCode == 401 || e.Code == 40311 || e.Code == 40312)
                     {
-                        throw e;
+                        throw;
                     }
                 }
                 catch (Exception e)
@@ -249,6 +265,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 {
                     AliyunTrack.ResetPhoneLoginData();
                     AliyunTrack.LoginEnableSDKLoginTrack();
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
                     if (XDGCommonInternal.IsCn())
                     {
                         await PhoneModule.Login();
@@ -259,13 +276,21 @@ namespace XD.SDK.Account.Internal.Standalone
                     }
 
                     UIManager.ShowLoading();
+#else
+                    throw new XDGError(ResponseCode.Common.Failed, "This function need vuplex enabled");
+#endif
                 }
                 else if (loginType == LoginType.Email)
                 {
                     AliyunTrack.ResetEmailLoginData();
                     AliyunTrack.LoginEnableSDKLoginTrack();
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
                     await EmailModule.LoginOrBind(true);
                     UIManager.ShowLoading();
+#else
+                    throw new XDGError(ResponseCode.Common.Failed, "This function need vuplex enabled");
+#endif
+
                 }
                 else
                 {
@@ -356,7 +381,7 @@ namespace XD.SDK.Account.Internal.Standalone
         public static async Task<XDGUser> LoginByConsole()
         {
             // 判断当前有接入哪个主机 SDK
-            if (SteamUtils.IsSDKSupported)
+            if (SteamWrapper.Initialized())
             {
                 try
                 {
@@ -444,7 +469,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 case LoginType.Facebook:
                     return await FacebookAuth.GetAuthData();
                 default:
-                    return new Dictionary<string, object>();
+                    throw new XDGError(ResponseCode.Account.TypeNotAvailable, "暂不支持的登录方式");
             }
         }
 

package/package.json

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